diff options
| author | jdonnelly@chromium.org <jdonnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 04:26:14 +0000 |
|---|---|---|
| committer | jdonnelly@chromium.org <jdonnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 04:26:14 +0000 |
| commit | 457861f945002367a95a079e2f99341c14dfc9ca (patch) | |
| tree | cedd6c4fd5dcea200e8ddfaf016b4d042e1aeefb /chrome/browser/autocomplete | |
| parent | 16a6af1553f9eddf570459ae859f812a5a100611 (diff) | |
| download | chromium_src-457861f945002367a95a079e2f99341c14dfc9ca.zip chromium_src-457861f945002367a95a079e2f99341c14dfc9ca.tar.gz chromium_src-457861f945002367a95a079e2f99341c14dfc9ca.tar.bz2 | |
[AiS] Add a new AutocompleteMatchType for answers in suggest.
BUG=383456
Review URL: https://codereview.chromium.org/327003003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
4 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index 1bb947f..09a82bd 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -80,6 +80,10 @@ void AutocompleteMatchToAssistedQuery( *subtype = 44; return; } + case AutocompleteMatchType::SEARCH_SUGGEST_ANSWER: { + *subtype = 70; + return; + } case AutocompleteMatchType::NAVSUGGEST: { // Do not set subtype here; subtype may have been set above. *type = 5; diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index 6911e44..0d101c8 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -157,6 +157,7 @@ int AutocompleteMatch::TypeToIcon(Type type) { IDR_OMNIBOX_SEARCH, IDR_OMNIBOX_HTTP, IDR_OMNIBOX_HTTP, + IDR_OMNIBOX_SEARCH, }; COMPILE_ASSERT(arraysize(icons) == AutocompleteMatchType::NUM_TYPES, icons_array_must_match_type_enum); @@ -339,7 +340,8 @@ bool AutocompleteMatch::IsSpecializedSearchType(Type type) { return type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY || type == AutocompleteMatchType::SEARCH_SUGGEST_INFINITE || type == AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED || - type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE; + type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE || + type == AutocompleteMatchType::SEARCH_SUGGEST_ANSWER; } void AutocompleteMatch::ComputeStrippedDestinationURL(Profile* profile) { diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc index cec6936..8582636 100644 --- a/chrome/browser/autocomplete/base_search_provider.cc +++ b/chrome/browser/autocomplete/base_search_provider.cc @@ -915,6 +915,7 @@ bool BaseSearchProvider::ParseSuggestResults(const base::Value& root_val, // Extract Answers, if provided. const base::DictionaryValue* answer_json = NULL; if (suggestion_detail->GetDictionary("ansa", &answer_json)) { + match_type = AutocompleteMatchType::SEARCH_SUGGEST_ANSWER; std::string contents; base::JSONWriter::Write(answer_json, &contents); answer_contents = base::UTF8ToUTF16(contents); diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc index e235b2d..8178bdb 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc @@ -199,6 +199,8 @@ TEST_F(ShortcutsBackendTest, SanitizeMatchCore) { "", "", AutocompleteMatchType::SEARCH_HISTORY }, { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_PROFILE, "", "", AutocompleteMatchType::SEARCH_HISTORY }, + { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_ANSWER, + "", "", AutocompleteMatchType::SEARCH_HISTORY }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |