| Index: chrome/common/pref_names.cc
|
| ===================================================================
|
| --- chrome/common/pref_names.cc (revision 204675)
|
| +++ chrome/common/pref_names.cc (working copy)
|
| @@ -1130,10 +1130,16 @@
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
| -// Boolean that controls the enabled-state of Geolocation.
|
| +// 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";
|
|
|
|
|