| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index d4fd972a213407749a196207f008dc4a91168884..63f3421cd0db44176a98e00d1ae680fe74975878 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -275,6 +275,12 @@ const char kOverscrollVerticalResistThreshold[] =
|
| "overscroll.vertical_resist_threshold";
|
| #endif // defined(USE_AURA)
|
|
|
| +#if BUILDFLAG(ENABLE_GOOGLE_NOW)
|
| +// Deprecated 3/2016
|
| +const char kGoogleGeolocationAccessEnabled[] =
|
| + "googlegeolocationaccess.enabled";
|
| +#endif
|
| +
|
| } // namespace
|
|
|
| namespace chrome {
|
| @@ -587,6 +593,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterListPref(kURLsToRestoreOnStartupOld);
|
| registry->RegisterInt64Pref(kRestoreStartupURLsMigrationTime, 0);
|
| registry->RegisterBooleanPref(kRestoreOnStartupMigrated, false);
|
| +
|
| +#if BUILDFLAG(ENABLE_GOOGLE_NOW)
|
| + registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false);
|
| +#endif
|
| }
|
|
|
| void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| @@ -663,6 +673,11 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
|
| profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold);
|
| profile_prefs->ClearPref(kOverscrollVerticalResistThreshold);
|
| #endif // defined(USE_AURA)
|
| +
|
| +#if BUILDFLAG(ENABLE_GOOGLE_NOW)
|
| + // Added 3/2016.
|
| + profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled);
|
| +#endif
|
| }
|
|
|
| } // namespace chrome
|
|
|