Index: content/browser/renderer_host/render_widget_host_view_aura.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h |
index 3e68f2bef3c474615dba221fd5cb6309e9b258d4..1aa32709cb7126cf9b70f086b3bdd0b1ea095e48 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -157,6 +157,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
virtual bool IsShowing() OVERRIDE; |
virtual gfx::Rect GetViewBounds() const OVERRIDE; |
virtual void SetBackground(const SkBitmap& background) OVERRIDE; |
+ virtual int GetVisibleViewportHeight() const OVERRIDE; |
+ virtual void SetKeyboardBounds(const gfx::Rect& bounds) OVERRIDE; |
// Overridden from RenderWidgetHostViewPort: |
virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, |
@@ -240,6 +242,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
virtual void OnSwapCompositorFrame( |
uint32 output_surface_id, |
scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; |
+ |
#if defined(OS_WIN) |
virtual void SetParentNativeViewAccessible( |
gfx::NativeViewAccessible accessible_parent) OVERRIDE; |
@@ -405,6 +408,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
UpdateCursorIfOverSelf); |
FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraCopyRequestTest, |
DestroyedAfterCopyRequest); |
+ FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
+ VisibleViewportTest); |
class WindowObserver; |
friend class WindowObserver; |
@@ -724,6 +729,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
TouchEditingClient* touch_editing_client_; |
+ gfx::Rect virtual_keyboard_bounds_; |
+ |
std::vector<ui::LatencyInfo> software_latency_info_; |
scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; |