From 05914245e8484daeba41d825565ee6a2571b7a3a Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Fri, 26 Jan 2024 14:03:26 -0800 Subject: [PATCH] Changes to make build work in Chromium. PiperOrigin-RevId: 601861725 --- sharing/common/nearby_share_prefs.cc | 92 +++++++++++-------- .../internal/base/utf_string_conversions.h | 11 ++- sharing/internal/public/logging.h | 4 +- 3 files changed, 67 insertions(+), 40 deletions(-) diff --git a/sharing/common/nearby_share_prefs.cc b/sharing/common/nearby_share_prefs.cc index b395f741..34357024 100644 --- a/sharing/common/nearby_share_prefs.cc +++ b/sharing/common/nearby_share_prefs.cc @@ -17,6 +17,7 @@ #include #include +#include "absl/base/attributes.h" #include "absl/time/clock.h" #include "sharing/internal/api/preference_manager.h" #include "sharing/proto/enums.pb.h" @@ -32,59 +33,74 @@ using FastInitiationNotificationState = ::nearby::sharing::proto::FastInitiationNotificationState; } // namespace -const char kNearbySharingAllowedContactsName[] = +ABSL_CONST_INIT const char kNearbySharingAllowedContactsName[] = "nearby_sharing.allowed_contacts"; -const char kNearbySharingBackgroundVisibilityName[] = +ABSL_CONST_INIT const char kNearbySharingBackgroundVisibilityName[] = "nearby_sharing.background_visibility"; -const char kNearbySharingBackgroundTemporarilyVisibleName[] = +ABSL_CONST_INIT const char kNearbySharingBackgroundTemporarilyVisibleName[] = "nearby_sharing.background_temporarily_visible"; -const char kNearbySharingBackgroundFallbackVisibilityName[] = +ABSL_CONST_INIT const char kNearbySharingBackgroundFallbackVisibilityName[] = "nearby_sharing.background_fallback_visibility"; -const char kNearbySharingBackgroundVisibilityExpirationSeconds[] = - "nearby_sharing.background_visibility_expiration_seconds"; -const char kNearbySharingContactUploadHashName[] = +ABSL_CONST_INIT const char + kNearbySharingBackgroundVisibilityExpirationSeconds[] = + "nearby_sharing.background_visibility_expiration_seconds"; +ABSL_CONST_INIT const char kNearbySharingContactUploadHashName[] = "nearby_sharing.contact_upload_hash"; -const char kNearbySharingCustomSavePath[] = "nearby_sharing.custom_save_path"; -const char kNearbySharingDataUsageName[] = "nearby_sharing.data_usage"; -const char kNearbySharingDeviceIdName[] = "nearby_sharing.device_id"; -const char kNearbySharingDeviceNameName[] = "nearby_sharing.device_name"; -const char kNearbySharingEnabledName[] = "nearby_sharing.enabled"; -const char kNearbySharingFastInitiationNotificationStateName[] = +ABSL_CONST_INIT const char kNearbySharingCustomSavePath[] = + "nearby_sharing.custom_save_path"; +ABSL_CONST_INIT const char kNearbySharingDataUsageName[] = + "nearby_sharing.data_usage"; +ABSL_CONST_INIT const char kNearbySharingDeviceIdName[] = + "nearby_sharing.device_id"; +ABSL_CONST_INIT const char kNearbySharingDeviceNameName[] = + "nearby_sharing.device_name"; +ABSL_CONST_INIT const char kNearbySharingEnabledName[] = + "nearby_sharing.enabled"; +ABSL_CONST_INIT const char kNearbySharingFastInitiationNotificationStateName[] = "nearby_sharing.fast_initiation_notification_state"; -const char kNearbySharingOnboardingCompleteName[] = +ABSL_CONST_INIT const char kNearbySharingOnboardingCompleteName[] = "nearby_sharing.onboarding_complete"; -const char kNearbySharingFullNameName[] = "nearby_sharing.full_name"; -const char kNearbySharingIconUrlName[] = "nearby_sharing.icon_url"; -const char kNearbySharingIconTokenName[] = "nearby_sharing.icon_token"; -const char kNearbySharingOnboardingDismissedTimeName[] = +ABSL_CONST_INIT const char kNearbySharingFullNameName[] = + "nearby_sharing.full_name"; +ABSL_CONST_INIT const char kNearbySharingIconUrlName[] = + "nearby_sharing.icon_url"; +ABSL_CONST_INIT const char kNearbySharingIconTokenName[] = + "nearby_sharing.icon_token"; +ABSL_CONST_INIT const char kNearbySharingOnboardingDismissedTimeName[] = "nearby_sharing.onboarding_dismissed_time"; -const char kNearbySharingPublicCertificateExpirationDictName[] = +ABSL_CONST_INIT const char kNearbySharingPublicCertificateExpirationDictName[] = "nearbyshare.public_certificate_expiration_dict"; -const char kNearbySharingPrivateCertificateListName[] = +ABSL_CONST_INIT const char kNearbySharingPrivateCertificateListName[] = "nearbyshare.private_certificate_list"; -const char kNearbySharingSchedulerContactDownloadAndUploadName[] = - "nearby_sharing.scheduler.contact_download_and_upload"; -const char kNearbySharingSchedulerDownloadDeviceDataName[] = +ABSL_CONST_INIT const char + kNearbySharingSchedulerContactDownloadAndUploadName[] = + "nearby_sharing.scheduler.contact_download_and_upload"; +ABSL_CONST_INIT const char kNearbySharingSchedulerDownloadDeviceDataName[] = "nearby_sharing.scheduler.download_device_data"; -const char kNearbySharingSchedulerDownloadPublicCertificatesName[] = - "nearby_sharing.scheduler.download_public_certificates"; -const char kNearbySharingSchedulerPeriodicContactUploadName[] = +ABSL_CONST_INIT const char + kNearbySharingSchedulerDownloadPublicCertificatesName[] = + "nearby_sharing.scheduler.download_public_certificates"; +ABSL_CONST_INIT const char kNearbySharingSchedulerPeriodicContactUploadName[] = "nearby_sharing.scheduler.periodic_contact_upload"; -const char kNearbySharingSchedulerPrivateCertificateExpirationName[] = - "nearby_sharing.scheduler.private_certificate_expiration"; -const char kNearbySharingSchedulerPublicCertificateExpirationName[] = - "nearby_sharing.scheduler.public_certificate_expiration"; -const char kNearbySharingSchedulerUploadDeviceNameName[] = +ABSL_CONST_INIT const char + kNearbySharingSchedulerPrivateCertificateExpirationName[] = + "nearby_sharing.scheduler.private_certificate_expiration"; +ABSL_CONST_INIT const char + kNearbySharingSchedulerPublicCertificateExpirationName[] = + "nearby_sharing.scheduler.public_certificate_expiration"; +ABSL_CONST_INIT const char kNearbySharingSchedulerUploadDeviceNameName[] = "nearby_sharing.scheduler.upload_device_name"; -const char kNearbySharingSchedulerUploadLocalDeviceCertificatesName[] = - "nearby_sharing.scheduler.upload_local_device_certificates"; -const char kNearbySharingUsersName[] = "nearby_sharing.users"; -const char kNearbySharingIsReceivingName[] = "nearby_sharing.is_receiving"; -const char kNearbySharingIsAnalyticsEnabledName[] = +ABSL_CONST_INIT const char + kNearbySharingSchedulerUploadLocalDeviceCertificatesName[] = + "nearby_sharing.scheduler.upload_local_device_certificates"; +ABSL_CONST_INIT const char kNearbySharingUsersName[] = "nearby_sharing.users"; +ABSL_CONST_INIT const char kNearbySharingIsReceivingName[] = + "nearby_sharing.is_receiving"; +ABSL_CONST_INIT const char kNearbySharingIsAnalyticsEnabledName[] = "nearby_sharing.is_analytics_enabled"; -const char kNearbySharingIsAllContactsEnabledName[] = +ABSL_CONST_INIT const char kNearbySharingIsAllContactsEnabledName[] = "nearby_sharing.is_all_contacts_enabled"; -const char kNearbySharingAutoAppStartEnabledName[] = +ABSL_CONST_INIT const char kNearbySharingAutoAppStartEnabledName[] = "nearby_sharing.auto_app_start_enabled"; void RegisterNearbySharingPrefs(PreferenceManager& preference_manager, diff --git a/sharing/internal/base/utf_string_conversions.h b/sharing/internal/base/utf_string_conversions.h index ca89f619..6c9cedd9 100644 --- a/sharing/internal/base/utf_string_conversions.h +++ b/sharing/internal/base/utf_string_conversions.h @@ -27,10 +27,19 @@ void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size, std::string* output) {} } // namespace nearby::utils - #elif defined(NEARBY_CHROMIUM) // Forward to chromium implementations. +#include "base/strings/string_util.h" +namespace nearby::utils { +bool IsStringUtf8(std::string_view str) { + return base::IsStringUTF8(str); +} +void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size, + std::string* output) { + base::TruncateUTF8ToByteSize(input, byte_size, output); +} +} // namespace nearby::utils #else // defined(GITHUB_BUILD) #include "sharing/internal/base/strings/utf_string_conversions.h" // IWYU pragma: export #endif // defined(GITHUB_BUILD) diff --git a/sharing/internal/public/logging.h b/sharing/internal/public/logging.h index 0d0a1525..df429df1 100644 --- a/sharing/internal/public/logging.h +++ b/sharing/internal/public/logging.h @@ -17,7 +17,9 @@ #if defined(NEARBY_CHROMIUM) // Chromium does not use absl log. Forward to Chromium native log macros. -// TODO(ftsui): include chromium logging header. +#include "base/check.h" +#include "base/check_op.h" +#include "glog/logging.h" #else // defined(NEARBY_CHROMIUM) #include "absl/log/check.h" #include "absl/log/log.h"