Chromium Code Reviews| Index: content/renderer/render_frame_impl.h |
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
| index 6ba4bb6ff5441baec59c37b82aaf2024797b70af..75b17d0fb56fd6a53991da8900dfe9982f5172aa 100644 |
| --- a/content/renderer/render_frame_impl.h |
| +++ b/content/renderer/render_frame_impl.h |
| @@ -23,6 +23,7 @@ |
| #include "build/build_config.h" |
| #include "content/common/accessibility_mode_enums.h" |
| #include "content/common/frame_message_enums.h" |
| +#include "content/common/host_zoom_level.mojom.h" |
| #include "content/common/mojo/service_registry_impl.h" |
| #include "content/public/common/console_message_level.h" |
| #include "content/public/common/javascript_message_type.h" |
| @@ -659,6 +660,7 @@ class CONTENT_EXPORT RenderFrameImpl |
| FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
| FRIEND_TEST_ALL_PREFIXES(RendererAccessibilityTest, |
| AccessibilityMessagesQueueWhileSwappedOut); |
| + FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, ZoomLimit); |
| // A wrapper class used as the callback for JavaScript executed |
| // in an isolated world. |
| @@ -981,6 +983,8 @@ class CONTENT_EXPORT RenderFrameImpl |
| void InitializeBlameContext(RenderFrameImpl* parent_frame); |
| + void OnGotZoomLevel(const GURL& url, double zoom_level); |
| + |
| // Stores the WebLocalFrame we are associated with. This is null from the |
| // constructor until BindToWebFrame is called, and it is null after |
| // frameDetached is called until destruction (which is asynchronous in the |
| @@ -1180,6 +1184,9 @@ class CONTENT_EXPORT RenderFrameImpl |
| std::unique_ptr<blink::WebBluetooth> bluetooth_; |
| + HostZoomLevels host_zoom_levels_; |
| + mojom::HostZoomLevelPtr host_zoom_level_; |
|
wjmaclean
2016/05/16 18:53:07
nit: these names are *very* similar and might be c
scottmg
2016/05/16 22:54:56
How about host_zoom_levels_ and mojo_host_zoom_lev
|
| + |
| // Manages play, pause notifications for WebMediaPlayer implementations; its |
| // lifetime is tied to the RenderFrame via the RenderFrameObserver interface. |
| media::RendererWebMediaPlayerDelegate* media_player_delegate_; |