| 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/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" | |
| 10 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 11 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 10 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
| 12 #include "chrome/browser/autocomplete/autocomplete_input.h" | 11 #include "chrome/browser/autocomplete/autocomplete_input.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_match.h" | 12 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 14 #include "chrome/browser/autocomplete/autocomplete_result.h" | 13 #include "chrome/browser/autocomplete/autocomplete_result.h" |
| 15 #include "chrome/browser/autocomplete/extension_app_provider.h" | 14 #include "chrome/browser/autocomplete/extension_app_provider.h" |
| 16 #include "chrome/browser/event_disposition.h" | 15 #include "chrome/browser/event_disposition.h" |
| 17 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
| 18 #include "chrome/browser/extensions/image_loading_tracker.h" | 17 #include "chrome/browser/extensions/image_loading_tracker.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/browser_finder.h" | 20 #include "chrome/browser/ui/browser_finder.h" |
| 22 #include "chrome/browser/ui/browser_tabstrip.h" | 21 #include "chrome/browser/ui/browser_tabstrip.h" |
| 23 #include "chrome/browser/ui/views/ash/extension_utils.h" | 22 #include "chrome/browser/ui/views/ash/extension_utils.h" |
| 24 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
| 25 #include "chrome/common/extensions/extension_icon_set.h" | 24 #include "chrome/common/extensions/extension_icon_set.h" |
| 26 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
| 27 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
| 28 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
| 29 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.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" |
| 33 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
| 34 | 34 |
| 35 namespace { | 35 namespace { |
| 36 | 36 |
| 37 int ACMatchStyleToTagStyle(int styles) { | 37 int ACMatchStyleToTagStyle(int styles) { |
| 38 int tag_styles = 0; | 38 int tag_styles = 0; |
| 39 if (styles & ACMatchClassification::URL) | 39 if (styles & ACMatchClassification::URL) |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 app_list::AppListModel::SearchResults* results) | 177 app_list::AppListModel::SearchResults* results) |
| 178 : profile_(profile), | 178 : profile_(profile), |
| 179 search_box_(search_box), | 179 search_box_(search_box), |
| 180 results_(results) { | 180 results_(results) { |
| 181 search_box_->SetHintText( | 181 search_box_->SetHintText( |
| 182 l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT)); | 182 l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT)); |
| 183 search_box_->SetIcon(*ui::ResourceBundle::GetSharedInstance(). | 183 search_box_->SetIcon(*ui::ResourceBundle::GetSharedInstance(). |
| 184 GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); | 184 GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); |
| 185 | 185 |
| 186 if (CommandLine::ForCurrentProcess()->HasSwitch( | 186 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 187 ash::switches::kAppListShowAppsOnly)) { | 187 app_list::switches::kAppListShowAppsOnly)) { |
| 188 // ExtensionAppProvider is a synchronous provider and does not really need a | 188 // ExtensionAppProvider is a synchronous provider and does not really need a |
| 189 // listener. | 189 // listener. |
| 190 apps_provider_ = new ExtensionAppProvider(NULL, profile); | 190 apps_provider_ = new ExtensionAppProvider(NULL, profile); |
| 191 } else { | 191 } else { |
| 192 controller_.reset(new AutocompleteController(profile, this)); | 192 controller_.reset(new AutocompleteController(profile, this)); |
| 193 } | 193 } |
| 194 } | 194 } |
| 195 | 195 |
| 196 SearchBuilder::~SearchBuilder() { | 196 SearchBuilder::~SearchBuilder() { |
| 197 } | 197 } |
| (...skipping 71 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 |