diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 01:52:45 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 01:52:45 +0000 |
| commit | aee541ebc97e1ff2c8bb43e4375913f582931d40 (patch) | |
| tree | 49e6735353739bef26d1e960738470247ffa0dc8 /chrome/browser/browser_prefs.cc | |
| parent | 470ad82d83b7773ed5c791a1f3b612087b980eee (diff) | |
| download | chromium_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/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 85eac53..187201a 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -16,6 +16,7 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extensions_ui.h" #include "chrome/browser/external_protocol_handler.h" +#include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_prefs.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/host_content_settings_map.h" @@ -102,6 +103,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { Blacklist::RegisterUserPrefs(user_prefs); PinnedTabCodec::RegisterUserPrefs(user_prefs); ExtensionPrefs::RegisterUserPrefs(user_prefs); + GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); #if defined(TOOLKIT_VIEWS) BrowserActionsContainer::RegisterUserPrefs(user_prefs); #elif defined(TOOLKIT_GTK) |