diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 19:49:45 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 19:49:45 +0000 |
| commit | e284e6d8f6079a7cfc8eb70f010cf2378253fb18 (patch) | |
| tree | 9cd71a6abb4d08b700e477f7e779cc978a39717d /chrome/browser/options_util.cc | |
| parent | eb6b623883f7956e10bdf1f1749257f91b2d75a7 (diff) | |
| download | chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.zip chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.tar.gz chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.tar.bz2 | |
Reland r37508. Implement HostContentSettingsMap.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/555172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/options_util.cc')
| -rw-r--r-- | chrome/browser/options_util.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc index 94732ea..6562c3d 100644 --- a/chrome/browser/options_util.cc +++ b/chrome/browser/options_util.cc @@ -7,6 +7,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/download/download_manager.h" +#include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -64,6 +65,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) { prefs::kWebKitSerifFontFamily, }; profile->GetDownloadManager()->ResetAutoOpenFiles(); + profile->GetHostContentSettingsMap()->ResetToDefaults(); for (size_t i = 0; i < arraysize(kUserPrefs); ++i) prefs->ClearPref(kUserPrefs[i]); |