Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3280)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 7484072: Migrate geolocation settings to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/geolocation/geolocation_settings_state.cc ('K') | « chrome/browser/geolocation/geolocation_settings_state_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index dab9d8a3059b6fdd817f1451c4841df2f7cb25be..dec2a74530fc5b5cdb5c32be06c8b121ff0a3193 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"
@@ -160,7 +158,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);
« chrome/browser/geolocation/geolocation_settings_state.cc ('K') | « chrome/browser/geolocation/geolocation_settings_state_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698