content/renderer/android/disambiguation_popup_helper.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/renderer/android/disambiguation_popup_helper.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/renderer/android/disambiguation_popup_helper.h

diff --git a/content/renderer/disambiguation_popup_helper.h b/content/renderer/android/disambiguation_popup_helper.h

similarity index 80%

rename from content/renderer/disambiguation_popup_helper.h

rename to content/renderer/android/disambiguation_popup_helper.h

index 0238f8a562ceda7027c25240c31c5bfed0f48246..ae9ef807920e779047d8152f01cb3b5e28884bf2 100644

--- a/content/renderer/disambiguation_popup_helper.h

+++ b/content/renderer/android/disambiguation_popup_helper.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CONTENT_RENDERER_DISAMBIGUATION_POPUP_HELPER_H_

-#define CONTENT_RENDERER_DISAMBIGUATION_POPUP_HELPER_H_

+#ifndef CONTENT_RENDERER_ANDROID_DISAMBIGUATION_POPUP_HELPER_H_

+#define CONTENT_RENDERER_ANDROID_DISAMBIGUATION_POPUP_HELPER_H_

#include "content/common/content_export.h"

#include "third_party/WebKit/public/platform/WebVector.h"

@@ -33,4 +33,4 @@ class DisambiguationPopupHelper {

} // namespace content

-#endif // CONTENT_RENDERER_DISAMBIGUATION_POPUP_HELPER_H_

+#endif // CONTENT_RENDERER_ANDROID_DISAMBIGUATION_POPUP_HELPER_H_