Index: content/browser/renderer_host/render_widget_host_view_base.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h |
index b68718d872502f57fcabdd9e55142c91f4b3377d..1335fad3101ecc557f514f37a7018404b24b7885 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_base.h |
+++ b/content/browser/renderer_host/render_widget_host_view_base.h |
@@ -397,16 +397,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, |
void AddObserver(RenderWidgetHostViewBaseObserver* observer); |
void RemoveObserver(RenderWidgetHostViewBaseObserver* observer); |
- // Exposed for testing. |
- virtual bool IsChildFrameForTesting() const; |
- virtual cc::SurfaceId SurfaceIdForTesting() const; |
- |
- protected: |
- // Interface class only, do not construct. |
- RenderWidgetHostViewBase(); |
- |
- void NotifyObserversAboutShutdown(); |
- |
// Returns a reference to the current instance of TextInputManager. The |
// reference is obtained from RenderWidgetHostDelegate. The first time a non- |
// null reference is obtained, its value is cached in |text_input_manager_| |
@@ -419,6 +409,16 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, |
// |text_input_manager_|. |
TextInputManager* GetTextInputManager(); |
+ // Exposed for testing. |
+ virtual bool IsChildFrameForTesting() const; |
+ virtual cc::SurfaceId SurfaceIdForTesting() const; |
+ |
+ protected: |
+ // Interface class only, do not construct. |
+ RenderWidgetHostViewBase(); |
+ |
+ void NotifyObserversAboutShutdown(); |
+ |
// Whether this view is a popup and what kind of popup it is (select, |
// autofill...). |
blink::WebPopupType popup_type_; |
@@ -458,10 +458,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, |
// The orientation of the display the renderer is currently on. |
display::Display::Rotation current_display_rotation_; |
- // Whether pinch-to-zoom should be enabled and pinch events forwarded to the |
- // renderer. |
- bool pinch_zoom_enabled_; |
- |
// A reference to current TextInputManager instance this RWHV is registered |
// with. This is initially nullptr until the first time the view calls |
// GetTextInputManager(). It also becomes nullptr when TextInputManager is |