Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1448)

Side by Side Diff: chrome/browser/ui/app_list/search/omnibox_provider.cc

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/app_list/search/omnibox_provider.h" 5 #include "chrome/browser/ui/app_list/search/omnibox_provider.h"
6 6
7 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 7 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
8 #include "chrome/browser/autocomplete/autocomplete_controller.h" 8 #include "chrome/browser/autocomplete/autocomplete_controller.h"
9 #include "chrome/browser/autocomplete/autocomplete_input.h" 9 #include "chrome/browser/autocomplete/autocomplete_input.h"
10 #include "chrome/browser/autocomplete/autocomplete_match.h" 10 #include "chrome/browser/autocomplete/autocomplete_match.h"
11 #include "chrome/browser/autocomplete/search_provider.h" 11 #include "chrome/browser/autocomplete/search_provider.h"
12 #include "chrome/browser/ui/app_list/search/chrome_search_result.h" 12 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
13 #include "chrome/browser/ui/browser_navigator.h" 13 #include "chrome/browser/ui/browser_navigator.h"
14 #include "components/metrics/proto/omnibox_event.pb.h"
14 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
15 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
16 17
17 namespace app_list { 18 namespace app_list {
18 19
19 namespace { 20 namespace {
20 21
21 int ACMatchStyleToTagStyle(int styles) { 22 int ACMatchStyleToTagStyle(int styles) {
22 int tag_styles = 0; 23 int tag_styles = 0;
23 if (styles & ACMatchClassification::URL) 24 if (styles & ACMatchClassification::URL)
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 controller_->search_provider()->set_in_app_list(); 141 controller_->search_provider()->set_in_app_list();
141 } 142 }
142 143
143 OmniboxProvider::~OmniboxProvider() {} 144 OmniboxProvider::~OmniboxProvider() {}
144 145
145 void OmniboxProvider::Start(const base::string16& query) { 146 void OmniboxProvider::Start(const base::string16& query) {
146 controller_->Start(AutocompleteInput(query, 147 controller_->Start(AutocompleteInput(query,
147 base::string16::npos, 148 base::string16::npos,
148 base::string16(), 149 base::string16(),
149 GURL(), 150 GURL(),
150 AutocompleteInput::INVALID_SPEC, 151 metrics::OmniboxEventProto::INVALID_SPEC,
151 false, 152 false,
152 false, 153 false,
153 true, 154 true,
154 true)); 155 true));
155 } 156 }
156 157
157 void OmniboxProvider::Stop() { 158 void OmniboxProvider::Stop() {
158 controller_->Stop(false); 159 controller_->Stop(false);
159 } 160 }
160 161
161 void OmniboxProvider::PopulateFromACResult(const AutocompleteResult& result) { 162 void OmniboxProvider::PopulateFromACResult(const AutocompleteResult& result) {
162 ClearResults(); 163 ClearResults();
163 for (ACMatches::const_iterator it = result.begin(); 164 for (ACMatches::const_iterator it = result.begin();
164 it != result.end(); 165 it != result.end();
165 ++it) { 166 ++it) {
166 if (!it->destination_url.is_valid()) 167 if (!it->destination_url.is_valid())
167 continue; 168 continue;
168 169
169 Add(scoped_ptr<SearchResult>(new OmniboxResult(profile_, *it))); 170 Add(scoped_ptr<SearchResult>(new OmniboxResult(profile_, *it)));
170 } 171 }
171 } 172 }
172 173
173 void OmniboxProvider::OnResultChanged(bool default_match_changed) { 174 void OmniboxProvider::OnResultChanged(bool default_match_changed) {
174 const AutocompleteResult& result = controller_->result(); 175 const AutocompleteResult& result = controller_->result();
175 PopulateFromACResult(result); 176 PopulateFromACResult(result);
176 } 177 }
177 178
178 } // namespace app_list 179 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_unittest.cc ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698