content/browser/frame_host/render_widget_host_view_guest.h - Issue 1926173002: Erase LinkDisambiguation code on desktop.

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_guest.h

Issue 1926173002: Erase LinkDisambiguation code on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another merge conflict Created 4 years, 7 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_guest.h

diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h

index 1a21d4abb6bdf347727227d5b84ca6d167ac26bf..bcefc2dc7e72a63c025d902ec8848d9b775d947d 100644

--- a/content/browser/frame_host/render_widget_host_view_guest.h

+++ b/content/browser/frame_host/render_widget_host_view_guest.h

@@ -117,12 +117,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest

void StopSpeaking() override;

#endif // defined(OS_MACOSX)

-#if defined(OS_ANDROID) || defined(USE_AURA)

- // RenderWidgetHostViewBase implementation.

- void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,

- const SkBitmap& zoomed_bitmap) override;

-#endif // defined(OS_ANDROID) || defined(USE_AURA)

void LockCompositingSurface() override;

void UnlockCompositingSurface() override;