| Index: chrome/common/pref_names.h
|
| diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
| index 5924eea30940584a70d07eec33069a5bb8f1f7bf..08f7784ed3e79f3e539dce716afbc5fb79ae6f8c 100644
|
| --- a/chrome/common/pref_names.h
|
| +++ b/chrome/common/pref_names.h
|
| @@ -164,9 +164,9 @@ extern const char kSafeBrowsingExtendedReportingOptInAllowed[];
|
| extern const char kSSLErrorOverrideAllowed[];
|
| extern const char kIncognitoModeAvailability[];
|
| extern const char kSearchSuggestEnabled[];
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| extern const char kContextualSearchEnabled[];
|
| -#endif
|
| +#endif // defined(OS_ANDROID)
|
| #if defined(OS_MACOSX)
|
| extern const char kConfirmToQuitEnabled[];
|
| extern const char kHideFullscreenToolbar[];
|
| @@ -176,6 +176,7 @@ extern const char kPromptForDownload[];
|
| extern const char kAlternateErrorPagesEnabled[];
|
| extern const char kDnsPrefetchingStartupList[];
|
| extern const char kDnsPrefetchingHostReferralList[];
|
| +extern const char kQuicAllowed[];
|
| extern const char kHttpServerProperties[];
|
| extern const char kNetworkQualities[];
|
| #if defined(OS_ANDROID)
|
| @@ -477,9 +478,9 @@ extern const char kGpuDriverInfoBuildFingerPrint[];
|
|
|
| // Deprecated preference for metric / crash reporting on Android. Use
|
| // kMetricsReportingEnabled instead.
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| extern const char kCrashReportingEnabled[];
|
| -#endif
|
| +#endif // defined(OS_ANDROID)
|
|
|
| extern const char kProfileLastUsed[];
|
| extern const char kProfilesLastActive[];
|
| @@ -491,12 +492,12 @@ extern const char kProfilesDeleted[];
|
| extern const char kStabilityOtherUserCrashCount[];
|
| extern const char kStabilityKernelCrashCount[];
|
| extern const char kStabilitySystemUncleanShutdownCount[];
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| extern const char kStabilityForegroundActivityType[];
|
| extern const char kStabilityLaunchedActivityFlags[];
|
| extern const char kStabilityLaunchedActivityCounts[];
|
| extern const char kStabilityCrashedActivityCounts[];
|
| -#endif
|
| +#endif // defined(OS_ANDROID)
|
|
|
| extern const char kStabilityPluginStats[];
|
| extern const char kStabilityPluginName[];
|
| @@ -552,11 +553,12 @@ extern const char kDisablePluginFinder[];
|
|
|
| extern const char kNtpAppPageNames[];
|
| extern const char kNtpCollapsedForeignSessions[];
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| extern const char kNtpCollapsedRecentlyClosedTabs[];
|
| extern const char kNtpCollapsedSnapshotDocument[];
|
| extern const char kNtpCollapsedSyncPromo[];
|
| -#endif
|
| +extern const char kContentSuggestionsConsecutiveIgnoredPrefName[];
|
| +#endif // defined(OS_ANDROID)
|
| extern const char kNtpShownPage[];
|
|
|
| extern const char kDevToolsAdbKey[];
|
| @@ -651,6 +653,7 @@ extern const char kDeviceRobotAnyApiRefreshToken[];
|
| extern const char kDeviceEnrollmentRequisition[];
|
| extern const char kDeviceEnrollmentAutoStart[];
|
| extern const char kDeviceEnrollmentCanExit[];
|
| +extern const char kDeviceDMToken[];
|
| extern const char kTimesHIDDialogShown[];
|
| extern const char kUsersLRUInputMethod[];
|
| extern const char kEchoCheckedOffers[];
|
| @@ -810,9 +813,9 @@ extern const char kEnableDRM[];
|
|
|
| extern const char kWatchdogExtensionActive[];
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| extern const char kPartnerBookmarkMappings[];
|
| -#endif
|
| +#endif // defined(OS_ANDROID)
|
|
|
| extern const char kQuickCheckEnabled[];
|
| extern const char kPacHttpsUrlStrippingEnabled[];
|
| @@ -866,6 +869,8 @@ extern const char kSearchGeolocationPreDisclosureMetricsRecorded[];
|
| extern const char kSearchGeolocationPostDisclosureMetricsRecorded[];
|
| #endif
|
|
|
| +extern const char kGoogleDSEGeolocationSetting[];
|
| +
|
| } // namespace prefs
|
|
|
| #endif // CHROME_COMMON_PREF_NAMES_H_
|
|
|