content/browser/frame_host/render_widget_host_view_child_frame.h - Issue 351683002: Adds link disambiguation popup support to Windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: attempt to fix athena build Created 6 years, 3 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:

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 d031118a4d6173313ddfaf3324aa2ac852bec7ae..97d9bf47bfeaa7868ed904f2eea74c64945ec15c 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(TOOLKIT_VIEWS)

// RenderWidgetHostViewBase implementation.

virtual void ShowDisambiguationPopup(

- const gfx::Rect& target_rect,

+ const gfx::Rect& rect_pixels,

const SkBitmap& zoomed_bitmap) OVERRIDE;

+#endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)

+#if defined(OS_ANDROID)

virtual void LockCompositingSurface() OVERRIDE;

virtual void UnlockCompositingSurface() OVERRIDE;

#endif // defined(OS_ANDROID)