diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 01:09:33 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 01:09:33 +0000 |
| commit | 779c33638f4b10def2d103f4703fa5bf58899aec (patch) | |
| tree | 7034c81d156706a56b8101d507c87cc7045e9cc9 /chrome/browser/profile.cc | |
| parent | 12cbfda3f72e24147789eed981e68c373ba1c14f (diff) | |
| download | chromium_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/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index c197a78..4e83acd 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -415,11 +415,7 @@ class OffTheRecordProfileImpl : public Profile, } virtual HostZoomMap* GetHostZoomMap() { - // Need to use a separate map from the normal one to avoid persisting zoom - // changes in OTR mode. - if (!host_zoom_map_) - host_zoom_map_ = new HostZoomMap(this); - return host_zoom_map_.get(); + return profile_->GetHostZoomMap(); } virtual Blacklist* GetPrivacyBlacklist() { @@ -546,8 +542,6 @@ class OffTheRecordProfileImpl : public Profile, scoped_ptr<HostContentSettingsMap> host_content_settings_map_; - scoped_refptr<HostZoomMap> host_zoom_map_; - // The download manager that only stores downloaded items in memory. scoped_refptr<DownloadManager> download_manager_; |