summaryrefslogtreecommitdiffstats
path: root/chrome/browser/options_util.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-30 01:09:33 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-30 01:09:33 +0000
commit779c33638f4b10def2d103f4703fa5bf58899aec (patch)
tree7034c81d156706a56b8101d507c87cc7045e9cc9 /chrome/browser/options_util.cc
parent12cbfda3f72e24147789eed981e68c373ba1c14f (diff)
downloadchromium_src-779c33638f4b10def2d103f4703fa5bf58899aec.zip
chromium_src-779c33638f4b10def2d103f4703fa5bf58899aec.tar.gz
chromium_src-779c33638f4b10def2d103f4703fa5bf58899aec.tar.bz2
A few fixes for the HostZoomMap:
* Persist changes from Incognito (per UI leads) * Clear the zoom settings when the user does "reset to defaults" in prefs BUG=none TEST=Open incognito, change a zoom level, restart, see that it's persisted Review URL: http://codereview.chromium.org/551213 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/options_util.cc')
-rw-r--r--chrome/browser/options_util.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc
index 6562c3d..9ef6f60 100644
--- a/chrome/browser/options_util.cc
+++ b/chrome/browser/options_util.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/host_content_settings_map.h"
+#include "chrome/browser/host_zoom_map.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
@@ -66,6 +67,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
};
profile->GetDownloadManager()->ResetAutoOpenFiles();
profile->GetHostContentSettingsMap()->ResetToDefaults();
+ profile->GetHostZoomMap()->ResetToDefaults();
for (size_t i = 0; i < arraysize(kUserPrefs); ++i)
prefs->ClearPref(kUserPrefs[i]);