diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 19:27:29 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 19:27:29 +0000 |
| commit | 87fa8441dcbe28f3fef458da43b3fcc1f16e31a3 (patch) | |
| tree | 7b5b555580baed0b909fa52f79922f016f15b30b /chrome/browser/prefs | |
| parent | b987e90e17a644bc6157252efbdfe8b16a3b72b3 (diff) | |
| download | chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.zip chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.tar.gz chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.tar.bz2 | |
Migrate geolocation settings to host content settings map and remove the geolocation settings map.
BUG=63656
TEST=host_content_settings_map_unittest.cc,
content_settings_pref_provider_unittest.cc
Review URL: http://codereview.chromium.org/7484072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 4bc07cd..fdb525d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/extensions_ui.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" -#include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_prefs.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/instant/instant_controller.h" @@ -28,7 +27,6 @@ #include "chrome/browser/metrics/metrics_log.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/net_pref_observer.h" -#include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/browser/net/ssl_config_service_manager.h" @@ -164,7 +162,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { DevToolsWindow::RegisterUserPrefs(user_prefs); PinnedTabCodec::RegisterUserPrefs(user_prefs); ExtensionPrefs::RegisterUserPrefs(user_prefs); - GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); TranslatePrefs::RegisterUserPrefs(user_prefs); DesktopNotificationService::RegisterUserPrefs(user_prefs); PrefProxyConfigService::RegisterPrefs(user_prefs); |