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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

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
« chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 3825ef0861106dbeb98908faee8c7b59f17b25ec..52385a105fffbd27600a6cdeff130e8aeff379fe 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -137,11 +137,14 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
const NativeWebKeyboardEvent& event) OVERRIDE;
#endif // defined(OS_MACOSX)
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_WIN)
sky 2014/08/04 20:05:19 OS_WIN->TOOLKIT_VIEWS
luken 2014/09/11 01:07:27 Done.
// RenderWidgetHostViewBase implementation.
virtual void ShowDisambiguationPopup(
const gfx::Rect& target_rect,
const SkBitmap& zoomed_bitmap) OVERRIDE;
+#endif // defined(OS_ANDROID) || defined(OS_WIN)
+
+#if defined(OS_ANDROID)
virtual void LockCompositingSurface() OVERRIDE;
virtual void UnlockCompositingSurface() OVERRIDE;
#endif // defined(OS_ANDROID)
« chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698