Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Unified Diff: content/browser/host_zoom_map_impl.h

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add std:: namespace to find() to fix Android compile. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.cc ('k') | content/browser/host_zoom_map_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/host_zoom_map_impl.h
diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h
index 155f18e00fb2babd091a352d5df7b2b6974982ce..0ad4fec46bf74ec0482d3b283488c0b0c265028b 100644
--- a/content/browser/host_zoom_map_impl.h
+++ b/content/browser/host_zoom_map_impl.h
@@ -19,6 +19,8 @@
namespace content {
+class WebContentsImpl;
+
// HostZoomMap needs to be deleted on the UI thread because it listens
// to notifications on there (and holds a NotificationRegistrar).
class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
@@ -46,6 +48,35 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
virtual scoped_ptr<Subscription> AddZoomLevelChangedCallback(
const ZoomLevelChangedCallback& callback) OVERRIDE;
+ // Returns the current zoom level for the specified WebContents. This may
+ // be a temporary zoom level, depending on UsesTemporaryZoomLevel().
+ double GetZoomLevelForWebContents(
+ const WebContentsImpl& web_contents_impl) const;
+
+ // Sets the zoom level for this WebContents. If this WebContents is using
+ // a temporary zoom level, then level is only applied to this WebContents.
+ // Otherwise, the level will be applied on a host level.
+ void SetZoomLevelForWebContents(const WebContentsImpl& web_contents_impl,
+ double level);
+
+ // Sets the zoom level for the specified view. The level may be set for only
+ // this view, or for the host, depending on UsesTemporaryZoomLevel().
+ void SetZoomLevelForView(int render_process_id,
+ int render_view_id,
+ double level,
+ const std::string& host);
+
+ // Returns whether the view manages its zoom level independently of other tabs
+ // displaying content from the same host.
+ bool UsesTemporaryZoomLevel(int render_process_id, int render_view_id) const;
+
+ // Sets whether the view manages its zoom level independently of other tabs
+ // displaying content from the same host, based on whether
+ // |uses_temporary_zoom_level| is true.
+ void SetUsesTemporaryZoomLevel(int render_process_id,
+ int render_view_id,
+ bool uses_temporary_zoom_level);
+
// Returns the temporary zoom level that's only valid for the lifetime of
// the given WebContents (i.e. isn't saved and doesn't affect other
// WebContentses) if it exists, the default zoom level otherwise.
@@ -68,11 +99,23 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
const NotificationDetails& details) OVERRIDE;
private:
- double GetZoomLevelForHost(const std::string& host) const;
-
typedef std::map<std::string, double> HostZoomLevels;
typedef std::map<std::string, HostZoomLevels> SchemeHostZoomLevels;
+ struct TemporaryZoomLevel {
+ TemporaryZoomLevel(int process_id, int view_id, double level);
+ TemporaryZoomLevel(int process_id, int view_id);
+ bool operator==(const TemporaryZoomLevel& other) const;
+
+ int render_process_id;
+ int render_view_id;
+ double zoom_level;
+ };
+
+ typedef std::vector<TemporaryZoomLevel> TemporaryZoomLevels;
+
+ double GetZoomLevelForHost(const std::string& host) const;
+
// Callbacks called when zoom level changes.
base::CallbackList<void(const ZoomLevelChange&)>
zoom_level_changed_callbacks_;
@@ -82,15 +125,9 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
SchemeHostZoomLevels scheme_host_zoom_levels_;
double default_zoom_level_;
- struct TemporaryZoomLevel {
- int render_process_id;
- int render_view_id;
- double zoom_level;
- };
-
// Don't expect more than a couple of tabs that are using a temporary zoom
// level, so vector is fine for now.
- std::vector<TemporaryZoomLevel> temporary_zoom_levels_;
+ TemporaryZoomLevels temporary_zoom_levels_;
// Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and
// |temporary_zoom_levels_| to guarantee thread safety.
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.cc ('k') | content/browser/host_zoom_map_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698