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

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

Issue 320713002: Revert of Omnibox: Combine Two Input Type Enums into One (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/omnibox/omnibox_log.cc ('k') | components/metrics.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 new OmniboxResult(profile_, *it)).Pass()); 171 new OmniboxResult(profile_, *it)).Pass());
171 } 172 }
172 } 173 }
173 174
174 void OmniboxProvider::OnResultChanged(bool default_match_changed) { 175 void OmniboxProvider::OnResultChanged(bool default_match_changed) {
175 const AutocompleteResult& result = controller_->result(); 176 const AutocompleteResult& result = controller_->result();
176 PopulateFromACResult(result); 177 PopulateFromACResult(result);
177 } 178 }
178 179
179 } // namespace app_list 180 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/omnibox/omnibox_log.cc ('k') | components/metrics.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698