diff options
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/extensions/api/preferences_private.json | 28 | ||||
-rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 3 |
3 files changed, 1 insertions, 36 deletions
diff --git a/chrome/common/extensions/api/preferences_private.json b/chrome/common/extensions/api/preferences_private.json index 8044178a..e409fb1 100644 --- a/chrome/common/extensions/api/preferences_private.json +++ b/chrome/common/extensions/api/preferences_private.json @@ -12,33 +12,7 @@ "$ref": "types.private.ChromeDirectSetting", "value": ["easy_unlock.proximity_required", {"type":"boolean"}], "description": "If true, a remote Easy Unlock device can only unlock the local device if it is in very close proximity (roughly, within a foot). This preference's value is a boolean, defaulting to <code>false</code>." - }, - "googleGeolocationAccessEnabled": { - "nocompile": true, - "$ref": "types.private.ChromeDirectSetting", - "value": ["googlegeolocationaccess.enabled", {"type":"boolean"}], - "description": "If enabled, Google services can access the user's location. This preference's value is a boolean, defaulting to <code>false</code>." - } - }, - "functions": [ - { - "name": "getSyncCategoriesWithoutPassphrase", - "description": "Returns a list of sync categories the user has enabled without using a custom passphrase for encryption. The possible values are those that can be returned from syncer::ModelTypeToString in sync/syncable/model_type.cc.", - "type": "function", - "parameters": [ - { - "name": "callback", - "type": "function", - "parameters": [ - { - "name": "categories", - "type": "array", - "items": {"type": "string"} - } - ] - } - ] } - ] + } } ] diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index cb643bb..503c0f9 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1577,12 +1577,6 @@ const char kWebAppCreateInQuickLaunchBar[] = // corresponding access token. const char kGeolocationAccessToken[] = "geolocation.access_token"; -#if BUILDFLAG(ENABLE_GOOGLE_NOW) -// Boolean that is true when Google services can use the user's location. -const char kGoogleGeolocationAccessEnabled[] = - "googlegeolocationaccess.enabled"; -#endif - // Boolean that specifies whether to enable the Google Now Launcher extension. // Note: This is not the notifications component gated by ENABLE_GOOGLE_NOW. const char kGoogleNowLauncherEnabled[] = "google_now_launcher.enabled"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 38ff6ae..1e3bd63 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -562,9 +562,6 @@ extern const char kWebAppCreateInQuickLaunchBar[]; extern const char kGeolocationAccessToken[]; -#if BUILDFLAG(ENABLE_GOOGLE_NOW) -extern const char kGoogleGeolocationAccessEnabled[]; -#endif extern const char kGoogleNowLauncherEnabled[]; extern const char kDefaultAudioCaptureDevice[]; |