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

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 (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/string16.h" 11 #include "base/string16.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h"
13 #include "base/time.h" 14 #include "base/time.h"
14 #include "base/utf_string_conversions.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/autocomplete_input.h" 18 #include "chrome/browser/autocomplete/autocomplete_input.h"
19 #include "chrome/browser/autocomplete/autocomplete_match.h" 19 #include "chrome/browser/autocomplete/autocomplete_match.h"
20 #include "chrome/browser/autocomplete/autocomplete_provider.h" 20 #include "chrome/browser/autocomplete/autocomplete_provider.h"
21 #include "chrome/browser/history/history_service.h" 21 #include "chrome/browser/history/history_service.h"
22 #include "chrome/browser/history/history_service_factory.h" 22 #include "chrome/browser/history/history_service_factory.h"
23 #include "chrome/browser/history/url_database.h" 23 #include "chrome/browser/history/url_database.h"
24 #include "chrome/browser/search/search.h" 24 #include "chrome/browser/search/search.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 true, // allow exact keyword matches 201 true, // allow exact keyword matches
202 AutocompleteInput::ALL_MATCHES)); // want all matches 202 AutocompleteInput::ALL_MATCHES)); // want all matches
203 } 203 }
204 204
205 void OmniboxUIHandler::ResetController() { 205 void OmniboxUIHandler::ResetController() {
206 controller_.reset(new AutocompleteController(profile_, this, 206 controller_.reset(new AutocompleteController(profile_, this,
207 chrome::IsInstantExtendedAPIEnabled() ? 207 chrome::IsInstantExtendedAPIEnabled() ?
208 AutocompleteClassifier::kInstantExtendedOmniboxProviders : 208 AutocompleteClassifier::kInstantExtendedOmniboxProviders :
209 AutocompleteClassifier::kDefaultOmniboxProviders)); 209 AutocompleteClassifier::kDefaultOmniboxProviders));
210 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698