summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 01:52:45 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 01:52:45 +0000
commitaee541ebc97e1ff2c8bb43e4375913f582931d40 (patch)
tree49e6735353739bef26d1e960738470247ffa0dc8 /chrome/browser/profile.cc
parent470ad82d83b7773ed5c791a1f3b612087b980eee (diff)
downloadchromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.zip
chromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.tar.gz
chromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.tar.bz2
Add GeolocationContentSettingsMap, a geolocation-specific variant of HostContentSettingsMap.
This was originally written by bulach and posted at http://codereview.chromium.org/1033004 ; modified and landed by me. BUG=37206 TEST=Tested by unittests TBR=bulach,joth Review URL: http://codereview.chromium.org/1084005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index c94b38c..802ad29 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/favicon_service.h"
+#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/spellcheck_host.h"
#include "chrome/browser/transport_security_persister.h"
#include "chrome/browser/history/history.h"
@@ -408,6 +409,10 @@ class OffTheRecordProfileImpl : public Profile,
return profile_->GetHostZoomMap();
}
+ virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
+ return profile_->GetGeolocationContentSettingsMap();
+ }
+
virtual Blacklist* GetPrivacyBlacklist() {
return profile_->GetPrivacyBlacklist();
}
@@ -987,6 +992,12 @@ HostZoomMap* ProfileImpl::GetHostZoomMap() {
return host_zoom_map_.get();
}
+GeolocationContentSettingsMap* ProfileImpl::GetGeolocationContentSettingsMap() {
+ if (!geolocation_content_settings_map_.get())
+ geolocation_content_settings_map_ = new GeolocationContentSettingsMap(this);
+ return geolocation_content_settings_map_.get();
+}
+
Blacklist* ProfileImpl::GetPrivacyBlacklist() {
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnablePrivacyBlacklists))