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 c418b50a2da96acb88cf7b4aa27e818c419e260b..37b2b426374465c9c1a10942f020721ac1e80c43 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -223,6 +223,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE; |
virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() |
OVERRIDE; |
+#if defined(OS_WIN) |
sky
2014/08/04 20:05:20
No ifdef here.
luken
2014/09/11 01:07:27
Done.
|
+ virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, |
+ const SkBitmap& zoomed_bitmap) OVERRIDE; |
+#endif |
virtual bool LockMouse() OVERRIDE; |
virtual void UnlockMouse() OVERRIDE; |
virtual void OnSwapCompositorFrame( |
@@ -330,6 +334,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// Notification that the LegacyRenderWidgetHostHWND was destroyed. |
void OnLegacyWindowDestroyed(); |
+ |
+ void DisambiguationPopupRendered(bool success, const SkBitmap& result); |
+ |
+ void HideDisambiguationPopup(); |
#endif |
// Method to indicate if this instance is shutting down or closing. |
@@ -544,7 +552,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
gfx::Point unlocked_global_mouse_position_; |
// Last cursor position relative to screen. Used to compute movementX/Y. |
gfx::Point global_mouse_position_; |
- // In mouse locked mode, we syntheticaly move the mouse cursor to the center |
+ // In mouse locked mode, we synthetically move the mouse cursor to the center |
// of the window when it reaches the window borders to avoid it going outside. |
// This flag is used to differentiate between these synthetic mouse move |
// events vs. normal mouse move events. |
@@ -570,7 +578,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
typedef std::map<HWND, WebPluginGeometry> PluginWindowMoves; |
// Contains information about each windowed plugin's clip and cutout rects ( |
- // from the renderer). This is needed because when the transient windoiws |
+ // from the renderer). This is needed because when the transient windows |
// over this view changes, we need this information in order to create a new |
// region for the HWND. |
PluginWindowMoves plugin_window_moves_; |
@@ -606,6 +614,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
+ gfx::Rect disambiguation_target_rect_; |
+ |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
}; |