summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 16:34:17 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 16:34:17 +0000
commit9094aa4849efc3b94782fd82778cf7713dd86912 (patch)
treeff1033d7043c6a921c768283fd6e745c7287786f /chrome/browser/content_settings
parentd54fcf04ad1b1b65e0a66c9b70f1ff073d3918a6 (diff)
downloadchromium_src-9094aa4849efc3b94782fd82778cf7713dd86912.zip
chromium_src-9094aa4849efc3b94782fd82778cf7713dd86912.tar.gz
chromium_src-9094aa4849efc3b94782fd82778cf7713dd86912.tar.bz2
Don't whitelist extensions for geolocation.
BUG=103530 TEST=see bug Review URL: http://codereview.chromium.org/8510008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
-rw-r--r--chrome/browser/content_settings/host_content_settings_map.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index db5d081..2c09ad2 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -362,8 +362,10 @@ bool HostContentSettingsMap::ShouldAllowAllContent(
const GURL& primary_url,
const GURL& secondary_url,
ContentSettingsType content_type) {
- if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
+ if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
+ content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
return false;
+ }
if (primary_url.SchemeIs(chrome::kExtensionScheme)) {
return content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
secondary_url.SchemeIs(chrome::kExtensionScheme);