content/content_renderer.gypi - 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/content_renderer.gypi

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/content_renderer.gypi

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi

index 84fb9bb107108e3db082efe7a368f84c43f542bf..d1b21a94976efa04efbcd10970a1aaed1d546d95 100644

--- a/content/content_renderer.gypi

+++ b/content/content_renderer.gypi

@@ -110,6 +110,8 @@

'renderer/android/address_detector.h',

'renderer/android/content_detector.cc',

'renderer/android/content_detector.h',

+ 'renderer/android/disambiguation_popup_helper.cc',

+ 'renderer/android/disambiguation_popup_helper.h',

'renderer/android/email_detector.cc',

'renderer/android/email_detector.h',

'renderer/android/phone_number_detector.cc',

@@ -173,8 +175,6 @@

'renderer/devtools/render_widget_screen_metrics_emulator.h',

'renderer/devtools/v8_sampling_profiler.cc',

'renderer/devtools/v8_sampling_profiler.h',

- 'renderer/disambiguation_popup_helper.cc',

- 'renderer/disambiguation_popup_helper.h',

'renderer/dom_automation_controller.cc',

'renderer/dom_automation_controller.h',

'renderer/dom_storage/dom_storage_cached_area.cc',

« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »