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

Side by Side Diff: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

Issue 443043003: Rename components/autocomplete to components/omnibox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webui/omnibox/omnibox_ui_handler.h" 5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 16 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
17 #include "chrome/browser/autocomplete/autocomplete_controller.h" 17 #include "chrome/browser/autocomplete/autocomplete_controller.h"
18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 19 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
20 #include "chrome/browser/history/history_service.h" 20 #include "chrome/browser/history/history_service.h"
21 #include "chrome/browser/history/history_service_factory.h" 21 #include "chrome/browser/history/history_service_factory.h"
22 #include "chrome/browser/search/search.h" 22 #include "chrome/browser/search/search.h"
23 #include "chrome/browser/search_engines/template_url_service_factory.h" 23 #include "chrome/browser/search_engines/template_url_service_factory.h"
24 #include "components/autocomplete/autocomplete_match.h"
25 #include "components/autocomplete/autocomplete_provider.h"
26 #include "components/bookmarks/browser/bookmark_model.h" 24 #include "components/bookmarks/browser/bookmark_model.h"
27 #include "components/history/core/browser/url_database.h" 25 #include "components/history/core/browser/url_database.h"
28 #include "components/metrics/proto/omnibox_event.pb.h" 26 #include "components/metrics/proto/omnibox_event.pb.h"
27 #include "components/omnibox/autocomplete_match.h"
28 #include "components/omnibox/autocomplete_provider.h"
29 #include "components/search_engines/template_url.h" 29 #include "components/search_engines/template_url.h"
30 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
31 #include "mojo/common/common_type_converters.h" 31 #include "mojo/common/common_type_converters.h"
32 32
33 namespace mojo { 33 namespace mojo {
34 34
35 template <> 35 template <>
36 class TypeConverter<mojo::Array<AutocompleteAdditionalInfoPtr>, 36 class TypeConverter<mojo::Array<AutocompleteAdditionalInfoPtr>,
37 AutocompleteMatch::AdditionalInfo> { 37 AutocompleteMatch::AdditionalInfo> {
38 public: 38 public:
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ChromeAutocompleteSchemeClassifier(profile_)); 198 ChromeAutocompleteSchemeClassifier(profile_));
199 controller_->Start(input_); 199 controller_->Start(input_);
200 } 200 }
201 201
202 void OmniboxUIHandler::ResetController() { 202 void OmniboxUIHandler::ResetController() {
203 controller_.reset(new AutocompleteController(profile_, 203 controller_.reset(new AutocompleteController(profile_,
204 TemplateURLServiceFactory::GetForProfile(profile_), 204 TemplateURLServiceFactory::GetForProfile(profile_),
205 this, 205 this,
206 AutocompleteClassifier::kDefaultOmniboxProviders)); 206 AutocompleteClassifier::kDefaultOmniboxProviders));
207 } 207 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h ('k') | chrome/browser/ui/webui/options/home_page_overlay_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698