chrome/browser/autocomplete/zero_suggest_provider.cc - Issue 22364007: AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext.

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/autocomplete/zero_suggest_provider.cc

Issue 22364007: AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« chrome/browser/autocomplete/autocomplete_input.h ('K') | « chrome/browser/autocomplete/zero_suggest_provider.h ('k') | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/autocomplete/zero_suggest_provider.cc

diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc

index bd850a69d63a770172ff1bd82e3607de34ea0560..4aefe6df16698386ed344a434630f60bab2a4324 100644

--- a/chrome/browser/autocomplete/zero_suggest_provider.cc

+++ b/chrome/browser/autocomplete/zero_suggest_provider.cc

@@ -151,7 +151,7 @@ void ZeroSuggestProvider::OnURLFetchComplete(const net::URLFetcher* source) {

void ZeroSuggestProvider::StartZeroSuggest(

const GURL& url,

- AutocompleteInput::PageClassification page_classification,

+ AutocompleteInput::OmniboxContext omnibox_context,

const string16& permanent_text) {

Stop(true);

field_trial_triggered_ = false;

@@ -162,7 +162,7 @@ void ZeroSuggestProvider::StartZeroSuggest(

done_ = false;

permanent_text_ = permanent_text;

current_query_ = url.spec();

- current_page_classification_ = page_classification;

+ omnibox_context_ = omnibox_context;

current_url_match_ = MatchForCurrentURL();

// TODO(jered): Consider adding locally-sourced zero-suggestions here too.

// These may be useful on the NTP or more relevant to the user than server

@@ -449,7 +449,7 @@ void ZeroSuggestProvider::ConvertResultsToAutocompleteMatches() {

AutocompleteMatch ZeroSuggestProvider::MatchForCurrentURL() {

AutocompleteInput input(permanent_text_, string16::npos, string16(),

- GURL(current_query_), current_page_classification_,

+ GURL(current_query_), omnibox_context_,

false, false, true, AutocompleteInput::ALL_MATCHES);

AutocompleteMatch match(