Adds link disambiguation popup support to Windows.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 1195 matching lines @@
   manager = BrowserAccessibilityManager::Create(
       BrowserAccessibilityManager::GetEmptyDocument(), delegate);
 #endif
   return manager;
 }
 
 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 RenderWidgetHostImpl? i.e. i'm
confused as to why there's a new method on RenderWidgetHostViewBase and
aura::WindowDelegate

[luken, 2014/07/30 19:17:31]

I made a mess plumbing things. I've now followed your suggestion, it's much
cleaner.

+}
+#endif
+
 bool RenderWidgetHostViewAura::LockMouse() {
   aura::Window* root_window = window_->GetRootWindow();
   if (!root_window)
     return false;
 
   if (mouse_locked_)
     return true;
 
   mouse_locked_ = true;
 #if !defined(OS_WIN)
@@ skipping 443 matching lines @@
 void RenderWidgetHostViewAura::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool RenderWidgetHostViewAura::HasHitTestMask() const {
   return false;
 }
 
 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:
 
 void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) {
   TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnKeyEvent");
   if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
     return;
 
   if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
     popup_child_host_view_->OnKeyEvent(event);
@@ skipping 797 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content