| 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 e8c19d77a5c9f4c7343cac343c0359a4b008bb5c..74178221b3c489494871d1ee8ca9490f67a84727 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -220,6 +220,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
|
| virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
|
| BrowserAccessibilityDelegate* delegate) OVERRIDE;
|
| +#if defined(OS_WIN)
|
| + 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(
|
| @@ -290,6 +294,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
|
| virtual bool HasHitTestMask() const OVERRIDE;
|
| virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
|
| + virtual void OnLinkDisambiguationPopupRequested(
|
| + const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) OVERRIDE;
|
|
|
| // Overridden from ui::EventHandler:
|
| virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| @@ -535,7 +541,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.
|
| @@ -561,7 +567,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_;
|
|
|