| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index f0865b0da428045f305da4d0a08ca74e178503dc..24433d4eda50053296ac227cbe334a506e848a63 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -201,7 +201,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"
|
| @@ -216,6 +215,11 @@
|
| #include "skia/ext/skia_utils_mac.h"
|
| #endif
|
|
|
| +// Support for link disambiguation popup.
|
| +#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| +#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"
|
| @@ -4031,7 +4035,7 @@ void RenderViewImpl::OnEnableViewSourceMode() {
|
| main_frame->enableViewSourceMode(true);
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| +#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| bool RenderViewImpl::didTapMultipleTargets(
|
| const blink::WebGestureEvent& event,
|
| const WebVector<WebRect>& target_rects) {
|
| @@ -4109,7 +4113,7 @@ bool RenderViewImpl::didTapMultipleTargets(
|
|
|
| return handled;
|
| }
|
| -#endif
|
| +#endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
|
|
| unsigned RenderViewImpl::GetLocalSessionHistoryLengthForTesting() const {
|
| return history_list_length_;
|
|
|