diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 18:37:50 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 18:37:50 +0000 |
| commit | 310cdc304f931c2bbcea7bef8c439f71ddb94c4d (patch) | |
| tree | 143404500872bd3022279c7ab1c1d5c0769b6e98 | |
| parent | b460b633dcc10b98f5e5759de753d7108a34a5e1 (diff) | |
| download | chromium_src-310cdc304f931c2bbcea7bef8c439f71ddb94c4d.zip chromium_src-310cdc304f931c2bbcea7bef8c439f71ddb94c4d.tar.gz chromium_src-310cdc304f931c2bbcea7bef8c439f71ddb94c4d.tar.bz2 | |
Merge 220250 "Fix bug that doesn't show verbatim query for ZeroS..."
> Fix bug that doesn't show verbatim query for ZeroSuggest in instant extended mode.
>
> BUG=280704
>
> Review URL: https://chromiumcodereview.appspot.com/23701007
TBR=hfung@chromium.org
Review URL: https://codereview.chromium.org/24103004
git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@224755 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete/zero_suggest_provider.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index f19b287..1d2ef0e 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -13,6 +13,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "chrome/browser/autocomplete/autocomplete_classifier.h" +#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" @@ -460,9 +462,9 @@ AutocompleteMatch ZeroSuggestProvider::MatchForCurrentURL() { GURL(current_query_), current_page_classification_, false, false, true, AutocompleteInput::ALL_MATCHES); - AutocompleteMatch match( - HistoryURLProvider::SuggestExactInput(this, input, - !HasHTTPScheme(input.text()))); + AutocompleteMatch match; + AutocompleteClassifierFactory::GetForProfile(profile_)->Classify( + permanent_text_, false, true, &match, NULL); match.is_history_what_you_typed_match = false; match.allowed_to_be_default_match = true; |