summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation/geolocation_prefs.h
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 08:26:32 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 08:26:32 +0000
commitc715ce96b3df17c073f6fac83cd4d3190db5d265 (patch)
tree95679e179b8d3623bb3ef8084ba1fdb146244261 /chrome/browser/geolocation/geolocation_prefs.h
parente0f465d25399bc018bfa6000022eacca935488dc (diff)
downloadchromium_src-c715ce96b3df17c073f6fac83cd4d3190db5d265.zip
chromium_src-c715ce96b3df17c073f6fac83cd4d3190db5d265.tar.gz
chromium_src-c715ce96b3df17c073f6fac83cd4d3190db5d265.tar.bz2
Upstream Geolocation global enable/disable preference.
Chrome for Android presents a checkbox in its user interface to control whether sites may request access to the geolocation API. This requires a new preference, "geolocation.enabled" to model this global switch. When geolocation.enabled is true, Chrome for Android will prompt the user (with an infobar) to confirm whether access should be granted. Sites that have been previously authorised by the user will be granted access automatically. When geolocation.enabled is false, Chrome for Android should prevent any access to the geolocation API for all sites (even those sites previously authorised). BUG=None TEST=unit_test:GeolocationPermissionContextTests.GeolocationEnabledDisabled Review URL: https://chromiumcodereview.appspot.com/10532126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/geolocation_prefs.h')
-rw-r--r--chrome/browser/geolocation/geolocation_prefs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_prefs.h b/chrome/browser/geolocation/geolocation_prefs.h
index cc39b66..c718912 100644
--- a/chrome/browser/geolocation/geolocation_prefs.h
+++ b/chrome/browser/geolocation/geolocation_prefs.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,6 +10,7 @@ class PrefService;
namespace geolocation {
void RegisterPrefs(PrefService* prefs);
+void RegisterUserPrefs(PrefService* user_prefs);
}
#endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PREFS_H_