diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
| commit | 437cf0eb7842e8db4a5702b4e18a5b865e58042a (patch) | |
| tree | 1f11c2defdb083f80235ace1e5835c1ba78f7100 /chrome/browser/browser_prefs.cc | |
| parent | 6828a51a1dea514c9bb57826ff9f1c3879287b92 (diff) | |
| download | chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.zip chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.gz chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.bz2 | |
Revert "Implement HostContentSettingsMap"
This reverts commit r37508, as it was crashing on the reliability bots.
Review URL: http://codereview.chromium.org/556076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37519 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, 0 insertions, 2 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 85f35a0..8e78310 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -17,7 +17,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/form_field_history_manager.h" #include "chrome/browser/google_url_tracker.h" -#include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/metrics/metrics_service.h" @@ -94,7 +93,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { ExtensionsUI::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); BlockedPopupContainer::RegisterUserPrefs(user_prefs); - HostContentSettingsMap::RegisterUserPrefs(user_prefs); HostZoomMap::RegisterUserPrefs(user_prefs); DevToolsManager::RegisterUserPrefs(user_prefs); Blacklist::RegisterUserPrefs(user_prefs); |