chrome/browser/android/contextualsearch/contextual_search_manager.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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: chrome/browser/android/contextualsearch/contextual_search_manager.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« no previous file with comments | « chrome/browser/android/compositor/tab_content_manager.cc ('k') | chrome/browser/android/document/document_web_contents_delegate.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/contextualsearch/contextual_search_manager.cc

diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.cc b/chrome/browser/android/contextualsearch/contextual_search_manager.cc

index 6ee66b6ff01ed7e522543f03d90c52116c802df3..fb2dc909d2098610191e3d38f1afc6d782e0530b 100644

--- a/chrome/browser/android/contextualsearch/contextual_search_manager.cc

+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.cc

@@ -244,6 +244,7 @@ void ContextualSearchManager::SetInterceptNavigationDelegate(

jobject obj,

jobject delegate,

jobject jweb_contents) {

+#if !defined(USE_AURA)

content::WebContents* web_contents =

content::WebContents::FromJavaWebContents(jweb_contents);

DCHECK(web_contents);

@@ -251,6 +252,7 @@ void ContextualSearchManager::SetInterceptNavigationDelegate(

web_contents,

make_scoped_ptr(new navigation_interception::InterceptNavigationDelegate(

env, delegate)));

+#endif

}

bool RegisterContextualSearchManager(JNIEnv* env) {