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

Side by Side Diff: chrome/browser/ui/views/ash/app_list/search_builder.cc

Issue 10660021: HiDPI assets for omnibox icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 8 years, 5 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/views/ash/app_list/search_builder.h" 5 #include "chrome/browser/ui/views/ash/app_list/search_builder.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "chrome/browser/autocomplete/autocomplete.h" 11 #include "chrome/browser/autocomplete/autocomplete.h"
12 #include "chrome/browser/autocomplete/autocomplete_match.h" 12 #include "chrome/browser/autocomplete/autocomplete_match.h"
13 #include "chrome/browser/autocomplete/extension_app_provider.h" 13 #include "chrome/browser/autocomplete/extension_app_provider.h"
14 #include "chrome/browser/event_disposition.h" 14 #include "chrome/browser/event_disposition.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/image_loading_tracker.h" 16 #include "chrome/browser/extensions/image_loading_tracker.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_finder.h" 19 #include "chrome/browser/ui/browser_finder.h"
20 #include "chrome/browser/ui/views/ash/extension_utils.h" 20 #include "chrome/browser/ui/views/ash/extension_utils.h"
21 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
22 #include "chrome/common/extensions/extension_icon_set.h" 22 #include "chrome/common/extensions/extension_icon_set.h"
23 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources_standard.h"
27 #include "ui/app_list/search_box_model.h" 27 #include "ui/app_list/search_box_model.h"
28 #include "ui/app_list/search_result.h" 28 #include "ui/app_list/search_result.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 namespace { 32 namespace {
33 33
34 int ACMatchStyleToTagStyle(int styles) { 34 int ACMatchStyleToTagStyle(int styles) {
35 int tag_styles = 0; 35 int tag_styles = 0;
36 if (styles & ACMatchClassification::URL) 36 if (styles & ACMatchClassification::URL)
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 ++it) { 266 ++it) {
267 results_->Add(new SearchBuilderResult(profile_, *it)); 267 results_->Add(new SearchBuilderResult(profile_, *it));
268 } 268 }
269 } 269 }
270 270
271 void SearchBuilder::OnResultChanged(bool default_match_changed) { 271 void SearchBuilder::OnResultChanged(bool default_match_changed) {
272 // TODO(xiyuan): Handle default match properly. 272 // TODO(xiyuan): Handle default match properly.
273 const AutocompleteResult& ac_result = controller_->result(); 273 const AutocompleteResult& ac_result = controller_->result();
274 PopulateFromACResult(ac_result); 274 PopulateFromACResult(ac_result);
275 } 275 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698