| Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc
|
| diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
|
| index cd552dc87ae8a45749a4c09e39a2720518ca73c5..06d33daacdfc4f07fe531d7d14bc135b847e1516 100644
|
| --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
|
| +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
|
| @@ -177,7 +177,6 @@ void AutocompleteControllerAndroid::OnOmniboxFocused(
|
| const JavaParamRef<jobject>& obj,
|
| const JavaParamRef<jstring>& j_omnibox_text,
|
| const JavaParamRef<jstring>& j_current_url,
|
| - jboolean is_query_in_omnibox,
|
| jboolean focused_from_fakebox) {
|
| if (!autocomplete_controller_)
|
| return;
|
| @@ -193,7 +192,7 @@ void AutocompleteControllerAndroid::OnOmniboxFocused(
|
|
|
| input_ = AutocompleteInput(
|
| omnibox_text, base::string16::npos, std::string(), current_url,
|
| - ClassifyPage(current_url, is_query_in_omnibox, focused_from_fakebox),
|
| + ClassifyPage(current_url, focused_from_fakebox),
|
| false, false, true, true, true,
|
| ChromeAutocompleteSchemeClassifier(profile_));
|
| autocomplete_controller_->Start(input_);
|
| @@ -218,7 +217,6 @@ void AutocompleteControllerAndroid::OnSuggestionSelected(
|
| const JavaParamRef<jobject>& obj,
|
| jint selected_index,
|
| const JavaParamRef<jstring>& j_current_url,
|
| - jboolean is_query_in_omnibox,
|
| jboolean focused_from_fakebox,
|
| jlong elapsed_time_since_first_modified,
|
| jint completed_length,
|
| @@ -226,7 +224,7 @@ void AutocompleteControllerAndroid::OnSuggestionSelected(
|
| base::string16 url = ConvertJavaStringToUTF16(env, j_current_url);
|
| const GURL current_url = GURL(url);
|
| OmniboxEventProto::PageClassification current_page_classification =
|
| - ClassifyPage(current_url, is_query_in_omnibox, focused_from_fakebox);
|
| + ClassifyPage(current_url, focused_from_fakebox);
|
| const base::TimeTicks& now(base::TimeTicks::Now());
|
| content::WebContents* web_contents =
|
| content::WebContents::FromJavaWebContents(j_web_contents);
|
| @@ -408,7 +406,6 @@ void AutocompleteControllerAndroid::NotifySuggestionsReceived(
|
|
|
| OmniboxEventProto::PageClassification
|
| AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl,
|
| - bool is_query_in_omnibox,
|
| bool focused_from_fakebox) const {
|
| if (!gurl.is_valid())
|
| return OmniboxEventProto::INVALID_SPEC;
|
| @@ -432,9 +429,6 @@ AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl,
|
| if (url == profile_->GetPrefs()->GetString(prefs::kHomePage))
|
| return OmniboxEventProto::HOME_PAGE;
|
|
|
| - if (is_query_in_omnibox)
|
| - return OmniboxEventProto::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
|
| -
|
| bool is_search_url = TemplateURLServiceFactory::GetForProfile(profile_)->
|
| IsSearchResultsPageFromDefaultSearchProvider(gurl);
|
| if (is_search_url)
|
|
|