| 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/ash/extension_utils.h" |
| 20 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/browser_finder.h" | 21 #include "chrome/browser/ui/browser_finder.h" |
| 22 #include "chrome/browser/ui/browser_tabstrip.h" | 22 #include "chrome/browser/ui/browser_tabstrip.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 "content/public/browser/user_metrics.h" |
| 27 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
| 28 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
| 29 #include "ui/app_list/app_list_switches.h" | 30 #include "ui/app_list/app_list_switches.h" |
| 30 #include "ui/app_list/search_box_model.h" | 31 #include "ui/app_list/search_box_model.h" |
| 31 #include "ui/app_list/search_result.h" | 32 #include "ui/app_list/search_result.h" |
| 32 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 33 #include "ui/base/resource/resource_bundle.h" | 34 #include "ui/base/resource/resource_bundle.h" |
| 34 | 35 |
| 35 namespace { | 36 namespace { |
| 36 | 37 |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 else | 226 else |
| 226 apps_provider_->Stop(true); | 227 apps_provider_->Stop(true); |
| 227 } | 228 } |
| 228 | 229 |
| 229 void SearchBuilder::OpenResult(const app_list::SearchResult& result, | 230 void SearchBuilder::OpenResult(const app_list::SearchResult& result, |
| 230 int event_flags) { | 231 int event_flags) { |
| 231 const SearchBuilderResult* builder_result = | 232 const SearchBuilderResult* builder_result = |
| 232 static_cast<const SearchBuilderResult*>(&result); | 233 static_cast<const SearchBuilderResult*>(&result); |
| 233 const AutocompleteMatch& match = builder_result->match(); | 234 const AutocompleteMatch& match = builder_result->match(); |
| 234 | 235 |
| 236 // Count AppList.Search here because it is composed of search + action. |
| 237 content::RecordAction(content::UserMetricsAction("AppList_Search")); |
| 238 |
| 235 if (match.type == AutocompleteMatch::EXTENSION_APP) { | 239 if (match.type == AutocompleteMatch::EXTENSION_APP) { |
| 236 const extensions::Extension* extension = | 240 const extensions::Extension* extension = |
| 237 GetExtensionByURL(profile_, match.destination_url); | 241 GetExtensionByURL(profile_, match.destination_url); |
| 238 if (extension) | 242 if (extension) { |
| 243 content::RecordAction( |
| 244 content::UserMetricsAction("AppList_ClickOnAppFromSearch")); |
| 239 extension_utils::OpenExtension(profile_, extension, event_flags); | 245 extension_utils::OpenExtension(profile_, extension, event_flags); |
| 246 } |
| 240 } else { | 247 } else { |
| 241 WindowOpenDisposition disposition = | 248 WindowOpenDisposition disposition = |
| 242 chrome::DispositionFromEventFlags(event_flags); | 249 chrome::DispositionFromEventFlags(event_flags); |
| 243 Browser* browser = browser::FindOrCreateTabbedBrowser(profile_); | 250 Browser* browser = browser::FindOrCreateTabbedBrowser(profile_); |
| 244 | 251 |
| 245 if (disposition == CURRENT_TAB) { | 252 if (disposition == CURRENT_TAB) { |
| 246 // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB. | 253 // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB. |
| 247 const GURL& url = chrome::GetActiveWebContents(browser) ? | 254 const GURL& url = chrome::GetActiveWebContents(browser) ? |
| 248 chrome::GetActiveWebContents(browser)->GetURL() : GURL(); | 255 chrome::GetActiveWebContents(browser)->GetURL() : GURL(); |
| 249 if (!url.SchemeIs(chrome::kChromeUIScheme) || | 256 if (!url.SchemeIs(chrome::kChromeUIScheme) || |
| (...skipping 19 matching lines...) Expand all Loading... |
| 269 ++it) { | 276 ++it) { |
| 270 results_->Add(new SearchBuilderResult(profile_, *it)); | 277 results_->Add(new SearchBuilderResult(profile_, *it)); |
| 271 } | 278 } |
| 272 } | 279 } |
| 273 | 280 |
| 274 void SearchBuilder::OnResultChanged(bool default_match_changed) { | 281 void SearchBuilder::OnResultChanged(bool default_match_changed) { |
| 275 // TODO(xiyuan): Handle default match properly. | 282 // TODO(xiyuan): Handle default match properly. |
| 276 const AutocompleteResult& ac_result = controller_->result(); | 283 const AutocompleteResult& ac_result = controller_->result(); |
| 277 PopulateFromACResult(ac_result); | 284 PopulateFromACResult(ac_result); |
| 278 } | 285 } |
| OLD | NEW |