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

Unified Diff: chrome/browser/ui/app_list/search/search_controller.cc

Issue 621823004: Simplifies the structure of app_list search a bit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/search/search_controller.cc
diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc
index 6a3fb4e1260a96176afdacdd4b9c5799f67066d9..1c0839b40dafe36056fd61bfd89b836a20bac911 100644
--- a/chrome/browser/ui/app_list/search/search_controller.cc
+++ b/chrome/browser/ui/app_list/search/search_controller.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
#include "chrome/browser/ui/app_list/search/app_search_provider.h"
-#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
#include "chrome/browser/ui/app_list/search/history.h"
#include "chrome/browser/ui/app_list/search/history_factory.h"
#include "chrome/browser/ui/app_list/search/omnibox_provider.h"
@@ -29,6 +28,7 @@
#include "grit/components_scaled_resources.h"
#include "grit/theme_resources.h"
#include "ui/app_list/search_box_model.h"
+#include "ui/app_list/search_result.h"
#include "ui/app_list/speech_ui_model.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -133,16 +133,14 @@ void SearchController::OpenResult(SearchResult* result, int event_flags) {
// Count AppList.Search here because it is composed of search + action.
content::RecordAction(base::UserMetricsAction("AppList_Search"));
- ChromeSearchResult* chrome_result =
- static_cast<app_list::ChromeSearchResult*>(result);
UMA_HISTOGRAM_ENUMERATION(kAppListSearchResultOpenTypeHistogram,
- chrome_result->GetType(),
+ result->GetType(),
SEARCH_RESULT_TYPE_BOUNDARY);
- chrome_result->Open(event_flags);
+ result->Open(event_flags);
if (history_ && history_->IsReady()) {
history_->AddLaunchEvent(base::UTF16ToUTF8(search_box_->text()),
- chrome_result->id());
+ result->id());
}
}
@@ -150,8 +148,7 @@ void SearchController::InvokeResultAction(SearchResult* result,
int action_index,
int event_flags) {
// TODO(xiyuan): Hook up with user learning.
- static_cast<app_list::ChromeSearchResult*>(result)->InvokeAction(
- action_index, event_flags);
+ result->InvokeAction(action_index, event_flags);
}
void SearchController::AddProvider(Mixer::GroupId group,

Powered by Google App Engine
This is Rietveld 408576698