Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index ad9fffb58881488ee7895c078cb31e83bcbbfc2d..9154254bc785133a716d4cf4e1a6df37e94ff676 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -1213,6 +1213,13 @@ gfx::GLSurfaceHandle RenderWidgetHostViewAura::GetCompositingSurface() { |
| return ImageTransportFactory::GetInstance()->GetSharedSurfaceHandle(); |
| } |
| +#if defined(OS_WIN) |
| +void RenderWidgetHostViewAura::ShowDisambiguationPopup( |
| + const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) { |
| + OnLinkDisambiguationPopupRequested(target_rect, zoomed_bitmap); |
|
jam
2014/07/22 01:04:26
why is this method both called by aura and by Rend
luken
2014/07/30 19:17:31
I made a mess plumbing things. I've now followed y
|
| +} |
| +#endif |
| + |
| bool RenderWidgetHostViewAura::LockMouse() { |
| aura::Window* root_window = window_->GetRootWindow(); |
| if (!root_window) |
| @@ -1676,6 +1683,15 @@ bool RenderWidgetHostViewAura::HasHitTestMask() const { |
| void RenderWidgetHostViewAura::GetHitTestMask(gfx::Path* mask) const { |
| } |
| +void RenderWidgetHostViewAura::OnLinkDisambiguationPopupRequested( |
| + const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) { |
| + if (window_->parent()->delegate()) { |
| + window_->parent()->delegate()->OnLinkDisambiguationPopupRequested( |
| + target_rect, zoomed_bitmap); |
| + } |
| +} |
| + |
|
jam
2014/07/22 01:04:26
nit: extra line
luken
2014/07/30 19:17:30
Done.
|
| + |
| //////////////////////////////////////////////////////////////////////////////// |
| // RenderWidgetHostViewAura, ui::EventHandler implementation: |