Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1811)

Unified Diff: content/renderer/render_view_impl.cc

Issue 351683002: Adds link disambiguation popup support to Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed scrolling cruft Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 048a26cbcf9e46e65474d52c2c3c4a75fce18140..764b448d4908e0e5ac93487c2dbb4501d1f59708 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -204,7 +204,6 @@
#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"
@@ -219,6 +218,11 @@
#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"
@@ -4126,7 +4130,7 @@ void RenderViewImpl::OnDisownOpener() {
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) {
@@ -4204,7 +4208,7 @@ bool RenderViewImpl::didTapMultipleTargets(
return handled;
}
-#endif
+#endif // defined(OS_ANDROID) || defined(OS_WIN)
unsigned RenderViewImpl::GetLocalSessionHistoryLengthForTesting() const {
return history_list_length_;

Powered by Google App Engine
This is Rietveld 408576698