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 bc2ad37a2f858a18c073c158fe2d2c3e3c8ef49d..a57c4a19d75f32cabab5aa0ba2c41329a007a91b 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -31,6 +31,7 @@ |
#include "third_party/skia/include/core/SkRegion.h" |
#include "ui/aura/client/cursor_client_observer.h" |
#include "ui/aura/client/focus_change_observer.h" |
+#include "ui/aura/client/virtual_keyboard_observer.h" |
#include "ui/aura/window_delegate.h" |
#include "ui/aura/window_tree_host_observer.h" |
#include "ui/base/ime/text_input_client.h" |
@@ -94,6 +95,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
public aura::client::ActivationChangeObserver, |
public aura::client::FocusChangeObserver, |
public aura::client::CursorClientObserver, |
+ public aura::client::VirtualKeyboardObserver, |
public ImageTransportFactoryObserver, |
public BrowserAccessibilityDelegate, |
public SoftwareFrameManagerClient, |
@@ -239,6 +241,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
virtual void OnSwapCompositorFrame( |
uint32 output_surface_id, |
scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; |
+ virtual float GetOverdrawBottomHeight() const OVERRIDE; |
#if defined(OS_WIN) |
virtual void SetParentNativeViewAccessible( |
gfx::NativeViewAccessible accessible_parent) OVERRIDE; |
@@ -320,6 +323,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// Overridden from aura::client::CursorClientObserver: |
virtual void OnCursorVisibilityChanged(bool is_visible) OVERRIDE; |
+ // Overridden from aura::client::VirtualKeyboardObserver: |
+ virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; |
+ |
// Overridden from aura::client::FocusChangeObserver: |
virtual void OnWindowFocused(aura::Window* gained_focus, |
aura::Window* lost_focus) OVERRIDE; |
@@ -755,6 +761,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// over this view changes, we need this information in order to create a new |
// region for the HWND. |
PluginWindowMoves plugin_window_moves_; |
+#elif defined(OS_CHROMEOS) |
+ // Bounds of onscreen keyboard. |
+ gfx::Rect virtual_keyboard_bounds_; |
#endif |
base::TimeTicks last_draw_ended_; |