diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 00:42:08 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 00:42:08 +0000 |
| commit | 4e2a25a083eb6169cefa155c3c290085ee4937b7 (patch) | |
| tree | 89140a14d93560d555fde446abbd24079dff6c48 /content/browser/host_zoom_map.h | |
| parent | bf5d32aede66b09c7caf030d3d1d4dcfc050564e (diff) | |
| download | chromium_src-4e2a25a083eb6169cefa155c3c290085ee4937b7.zip chromium_src-4e2a25a083eb6169cefa155c3c290085ee4937b7.tar.gz chromium_src-4e2a25a083eb6169cefa155c3c290085ee4937b7.tar.bz2 | |
No need to have HostZoomMap know about "original" map, which is really just another way of saying parent profile. The only place where it was used, in RenderViewHost::OnDidZoomURL, would end up firing a notification that the OffTheRecordProfile was already watching.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9113073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/host_zoom_map.h')
| -rw-r--r-- | content/browser/host_zoom_map.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h index 1bd7134..53dd770 100644 --- a/content/browser/host_zoom_map.h +++ b/content/browser/host_zoom_map.h @@ -29,8 +29,11 @@ class CONTENT_EXPORT HostZoomMap public base::RefCountedThreadSafe< HostZoomMap, content::BrowserThread::DeleteOnUIThread> { public: - explicit HostZoomMap(); - explicit HostZoomMap(HostZoomMap* original); + HostZoomMap(); + + // Copy the zoom levels from the given map. Can only be called on the UI + // thread. + void CopyFrom(HostZoomMap* copy); // Returns the zoom level for the host or spec for a given url. The zoom // level is determined by the host portion of the URL, or (in the absence of @@ -73,8 +76,6 @@ class CONTENT_EXPORT HostZoomMap double default_zoom_level() const { return default_zoom_level_; } void set_default_zoom_level(double level) { default_zoom_level_ = level; } - HostZoomMap* GetOriginal() const { return original_; } - private: friend class base::RefCountedThreadSafe< HostZoomMap, content::BrowserThread::DeleteOnUIThread>; @@ -85,15 +86,11 @@ class CONTENT_EXPORT HostZoomMap typedef std::map<std::string, double> HostZoomLevels; virtual ~HostZoomMap(); - void Init(); // Copy of the pref data, so that we can read it on the IO thread. HostZoomLevels host_zoom_levels_; double default_zoom_level_; - // Original HostZoomMap passed in constructor or itself. - HostZoomMap* original_; - struct TemporaryZoomLevel { int render_process_id; int render_view_id; |