From ea0e4af3f7ed2d3334c5566b00d0d160fc3e17da Mon Sep 17 00:00:00 2001 From: thestig Date: Mon, 27 Oct 2014 17:13:51 -0700 Subject: Cleanup: Sync up ifdefs in pref_names.cc and pref_names.h. Review URL: https://codereview.chromium.org/673343003 Cr-Commit-Position: refs/heads/master@{#301505} --- chrome/common/pref_names.cc | 44 +++++++++++++++++++++----------------------- chrome/common/pref_names.h | 12 +++++++++++- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index adaccf1..8b94312 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1051,26 +1051,6 @@ const char kAutofillDialogDefaults[] = "autofill.rac_dialog_defaults"; const char kPinnedTabs[] = "pinned_tabs"; #endif -#if defined(OS_ANDROID) -// Boolean that controls the enabled-state of Geolocation in content. -const char kGeolocationEnabled[] = "geolocation.enabled"; -#endif - -#if defined(ENABLE_GOOGLE_NOW) -// Boolean that is true when Google services can use the user's location. -const char kGoogleGeolocationAccessEnabled[] = - "googlegeolocationaccess.enabled"; -#endif - -// The default audio capture device used by the Media content setting. -const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device"; - -// The default video capture device used by the Media content setting. -const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device"; - -// The salt used for creating random MediaSource IDs. -const char kMediaDeviceIdSalt[] = "media.device_id_salt"; - // Preference to disable 3D APIs (WebGL, Pepper 3D). const char kDisable3DAPIs[] = "disable_3d_apis"; @@ -1632,7 +1612,6 @@ const char kInvalidationServiceUseGCMChannel[] = // when on-line authentication is not available. const char kGoogleServicesPasswordHash[] = "google.services.password_hash"; -#if !defined(OS_ANDROID) // Tracks the number of times that we have shown the sign in promo at startup. const char kSignInPromoStartupCount[] = "sync_promo.startup_count"; @@ -1648,7 +1627,6 @@ const char kSignInPromoShowOnFirstRunAllowed[] = // Boolean that specifies if we should show a bubble in the new tab page. // The bubble is used to confirm that the user is signed into sync. const char kSignInPromoShowNTPBubble[] = "sync_promo.show_ntp_bubble"; -#endif // Create web application shortcut dialog preferences. const char kWebAppCreateOnDesktop[] = "browser.web_app.create_on_desktop"; @@ -1660,6 +1638,26 @@ const char kWebAppCreateInQuickLaunchBar[] = // corresponding access token. const char kGeolocationAccessToken[] = "geolocation.access_token"; +#if defined(OS_ANDROID) +// Boolean that controls the enabled-state of Geolocation in content. +const char kGeolocationEnabled[] = "geolocation.enabled"; +#endif + +#if defined(ENABLE_GOOGLE_NOW) +// Boolean that is true when Google services can use the user's location. +const char kGoogleGeolocationAccessEnabled[] = + "googlegeolocationaccess.enabled"; +#endif + +// The default audio capture device used by the Media content setting. +const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device"; + +// The default video capture device used by the Media content setting. +const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device"; + +// The salt used for creating random MediaSource IDs. +const char kMediaDeviceIdSalt[] = "media.device_id_salt"; + // Boolean that indicates whether to allow firewall traversal while trying to // establish the initial connection from the client or host. const char kRemoteAccessHostFirewallTraversal[] = @@ -1930,7 +1928,7 @@ const char kLogoutStartedLast[] = "chromeos.logout-started"; // chrome/browser/chromeos/policy/consumer_management_service.h const char kConsumerManagementEnrollmentStage[] = "consumer_management.enrollment_stage"; -#endif +#endif // defined(OS_CHROMEOS) // Whether there is a Flash version installed that supports clearing LSO data. const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 0a58a65f..b05735c 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -310,7 +310,9 @@ extern const char kPluginsDisabledPluginsExceptions[]; extern const char kPluginsEnabledPlugins[]; extern const char kPluginsMigratedToPepperFlash[]; extern const char kPluginsRemovedOldComponentPepperFlashSettings[]; +#if !defined(OS_ANDROID) extern const char kPluginsShowDetails[]; +#endif extern const char kPluginsAllowOutdated[]; extern const char kPluginsAlwaysAuthorize[]; #if defined(ENABLE_PLUGIN_INSTALLATION) @@ -323,7 +325,9 @@ extern const char kDefaultBrowserSettingEnabled[]; extern const char kShowUpdatePromotionInfoBar[]; #endif extern const char kUseCustomChromeFrame[]; +#if !defined(OS_ANDROID) extern const char kContentSettingsPluginWhitelist[]; +#endif extern const char kBlockThirdPartyCookies[]; extern const char kClearSiteDataOnExit[]; extern const char kPartitionDefaultZoomLevel[]; @@ -338,7 +342,9 @@ extern const char kAutofillDialogWalletShippingSameAsBilling[]; extern const char kAutofillGeneratedCardBubbleTimesShown[]; extern const char kAutofillDialogDefaults[]; +#if !defined(OS_ANDROID) extern const char kPinnedTabs[]; +#endif extern const char kDisable3DAPIs[]; extern const char kEnableDeprecatedWebPlatformFeatures[]; @@ -556,6 +562,8 @@ extern const char kGoogleServicesPasswordHash[]; extern const char kInvalidationServiceUseGCMChannel[]; +// TODO(thestig): These 4 prefs should not be defined on mobile. +// Fix for http://crbug.com/159847 extern const char kSignInPromoStartupCount[]; extern const char kSignInPromoUserSkipped[]; extern const char kSignInPromoShowOnFirstRunAllowed[]; @@ -660,7 +668,7 @@ extern const char kServerBackedDeviceState[]; extern const char kCustomizationDefaultWallpaperURL[]; extern const char kLogoutStartedLast[]; extern const char kConsumerManagementEnrollmentStage[]; -#endif +#endif // defined(OS_CHROMEOS) extern const char kClearPluginLSODataEnabled[]; extern const char kPepperFlashSettingsEnabled[]; @@ -676,7 +684,9 @@ extern const char kTabStripStackedLayout[]; extern const char kRegisteredBackgroundContents[]; +#if !defined(OS_ANDROID) extern const char kShownAutoLaunchInfobar[]; +#endif extern const char kAuthSchemes[]; extern const char kDisableAuthNegotiateCnameLookup[]; -- cgit v1.1