Adds link disambiguation popup support to Windows.

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 186 matching lines @@
 #include "v8/include/v8.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/renderer/android/address_detector.h"
 #include "content/renderer/android/content_detector.h"
 #include "content/renderer/android/email_detector.h"
 #include "content/renderer/android/phone_number_detector.h"
 #include "net/android/network_library.h"
-#include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "ui/gfx/rect_f.h"
 
 #elif defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "ui/native_theme/native_theme_win.h"
 #elif defined(USE_X11)
 #include "ui/native_theme/native_theme.h"
 #elif defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
+// Support for link disambiguation popup.
+#if defined(OS_ANDROID) || defined(OS_WIN)

[sky, 2014/08/04 20:05:20]

OS_WIN->TOOLKIT_VIEWS

[luken, 2014/09/11 01:07:28]

Done.

+#include "skia/ext/platform_canvas.h"
+#endif
+
 #if defined(ENABLE_PLUGINS)
 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/pepper_plugin_registry.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #endif
 
@@ skipping 3887 matching lines @@
 
 void RenderViewImpl::OnDisownOpener() {
   if (!webview())
     return;
 
   WebFrame* main_frame = webview()->mainFrame();
   if (main_frame && main_frame->opener())
     main_frame->setOpener(NULL);
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_WIN)

[sky, 2014/08/04 20:05:20]

OS_WIN->TOOLKIT_VIEWS

[luken, 2014/09/11 01:07:28]

Done.

 bool RenderViewImpl::didTapMultipleTargets(
     const blink::WebGestureEvent& event,
     const WebVector<WebRect>& target_rects) {
   // Never show a disambiguation popup when accessibility is enabled,
   // as this interferes with "touch exploration".
   AccessibilityMode accessibility_mode =
       main_render_frame()->accessibility_mode();
   bool matches_accessibility_mode_complete =
       (accessibility_mode & AccessibilityModeComplete) ==
           AccessibilityModeComplete;
@@ skipping 57 matching lines @@
       handled = true;
       break;
     }
     case TAP_MULTIPLE_TARGETS_STRATEGY_NONE:
       // No-op.
       break;
   }
 
   return handled;
 }
-#endif
+#endif  // defined(OS_ANDROID) || defined(OS_WIN)
 
 unsigned RenderViewImpl::GetLocalSessionHistoryLengthForTesting() const {
   return history_list_length_;
 }
 
 void RenderViewImpl::SetFocusAndActivateForTesting(bool enable) {
   if (enable) {
     if (has_focus())
       return;
     OnSetActive(true);
@@ skipping 77 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content