chrome/browser/android/tab_android.cc - Issue 1260033003: Partially componentize //chrome/browser/search/search.{h,cc}

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/tab_android.cc

Issue 1260033003: Partially componentize //chrome/browser/search/search.{h,cc} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on iOS Created 5 years, 4 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/omnibox/autocomplete_controller_android.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/tab_android.cc

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc

index 77cbeec097a3916611a9e65a15476a320877518a..84184b702506893484d1dfe77d0a47896256afec 100644

--- a/chrome/browser/android/tab_android.cc

+++ b/chrome/browser/android/tab_android.cc

@@ -552,7 +552,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,

InstantSearchPrerenderer::GetForProfile(GetProfile());

if (prerenderer) {

const base::string16& search_terms =

- chrome::ExtractSearchTermsFromURL(GetProfile(), gurl);

+ search::ExtractSearchTermsFromURL(GetProfile(), gurl);

if (!search_terms.empty() &&

prerenderer->CanCommitQuery(web_contents_.get(), search_terms)) {

EmbeddedSearchRequestParams request_params(gurl);

@@ -603,7 +603,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,

static_cast<blink::WebReferrerPolicy>(referrer_policy));

}

const base::string16 search_terms =

- chrome::ExtractSearchTermsFromURL(GetProfile(), gurl);

+ search::ExtractSearchTermsFromURL(GetProfile(), gurl);

SearchTabHelper* search_tab_helper =

SearchTabHelper::FromWebContents(web_contents_.get());

if (!search_terms.empty() && search_tab_helper &&