diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:37:01 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:37:01 +0000 |
| commit | 13ffa32ea65d5fda56bcb030643b989d5564c586 (patch) | |
| tree | 984b9099172bbda4a8c37792131555de17d75899 /content/browser/host_zoom_map.cc | |
| parent | c7b6a22a88e1333214f53550558d709abebdef44 (diff) | |
| download | chromium_src-13ffa32ea65d5fda56bcb030643b989d5564c586.zip chromium_src-13ffa32ea65d5fda56bcb030643b989d5564c586.tar.gz chromium_src-13ffa32ea65d5fda56bcb030643b989d5564c586.tar.bz2 | |
Make sure that per-hostname zoom settings are retained.
BUG=83785
TEST=zoom settings are retained per hostname after browser shutdown.
Review URL: http://codereview.chromium.org/7077031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/host_zoom_map.cc')
| -rw-r--r-- | content/browser/host_zoom_map.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/host_zoom_map.cc b/content/browser/host_zoom_map.cc index 63c1c83..79b0d18 100644 --- a/content/browser/host_zoom_map.cc +++ b/content/browser/host_zoom_map.cc @@ -24,18 +24,15 @@ HostZoomMap::HostZoomMap() : default_zoom_level_(0.0) { NotificationService::AllSources()); } -double HostZoomMap::GetZoomLevel(const GURL& url) const { - std::string host(net::GetHostOrSpecFromURL(url)); +double HostZoomMap::GetZoomLevel(std::string host) const { base::AutoLock auto_lock(lock_); HostZoomLevels::const_iterator i(host_zoom_levels_.find(host)); return (i == host_zoom_levels_.end()) ? default_zoom_level_ : i->second; } -void HostZoomMap::SetZoomLevel(const GURL& url, double level) { +void HostZoomMap::SetZoomLevel(std::string host, double level) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - std::string host(net::GetHostOrSpecFromURL(url)); - { base::AutoLock auto_lock(lock_); if (level == default_zoom_level_) |