OLD | NEW |
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/ash/app_list/search_builder.h" | 5 #include "chrome/browser/ui/ash/app_list/search_builder.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 10 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
11 #include "chrome/browser/autocomplete/autocomplete_input.h" | 11 #include "chrome/browser/autocomplete/autocomplete_input.h" |
12 #include "chrome/browser/autocomplete/autocomplete_match.h" | 12 #include "chrome/browser/autocomplete/autocomplete_match.h" |
13 #include "chrome/browser/autocomplete/autocomplete_result.h" | 13 #include "chrome/browser/autocomplete/autocomplete_result.h" |
14 #include "chrome/browser/autocomplete/extension_app_provider.h" | 14 #include "chrome/browser/autocomplete/extension_app_provider.h" |
15 #include "chrome/browser/event_disposition.h" | 15 #include "chrome/browser/event_disposition.h" |
16 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
17 #include "chrome/browser/extensions/image_loading_tracker.h" | 17 #include "chrome/browser/extensions/image_loading_tracker.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/browser/ui/ash/extension_utils.h" |
19 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/browser_finder.h" | 21 #include "chrome/browser/ui/browser_finder.h" |
21 #include "chrome/browser/ui/browser_tabstrip.h" | 22 #include "chrome/browser/ui/browser_tabstrip.h" |
22 #include "chrome/browser/ui/views/ash/extension_utils.h" | |
23 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
24 #include "chrome/common/extensions/extension_icon_set.h" | 24 #include "chrome/common/extensions/extension_icon_set.h" |
25 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
26 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.h" |
29 #include "ui/app_list/app_list_switches.h" | 29 #include "ui/app_list/app_list_switches.h" |
30 #include "ui/app_list/search_box_model.h" | 30 #include "ui/app_list/search_box_model.h" |
31 #include "ui/app_list/search_result.h" | 31 #include "ui/app_list/search_result.h" |
32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 ++it) { | 269 ++it) { |
270 results_->Add(new SearchBuilderResult(profile_, *it)); | 270 results_->Add(new SearchBuilderResult(profile_, *it)); |
271 } | 271 } |
272 } | 272 } |
273 | 273 |
274 void SearchBuilder::OnResultChanged(bool default_match_changed) { | 274 void SearchBuilder::OnResultChanged(bool default_match_changed) { |
275 // TODO(xiyuan): Handle default match properly. | 275 // TODO(xiyuan): Handle default match properly. |
276 const AutocompleteResult& ac_result = controller_->result(); | 276 const AutocompleteResult& ac_result = controller_->result(); |
277 PopulateFromACResult(ac_result); | 277 PopulateFromACResult(ac_result); |
278 } | 278 } |
OLD | NEW |