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

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

Issue 640103002: Adds full-functional search results for Athena on Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix DEPS 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
« no previous file with comments | « athena/test/base/athena_test_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/app_result.cc
diff --git a/chrome/browser/ui/app_list/search/app_result.cc b/chrome/browser/ui/app_list/search/app_result.cc
index 4f628b349c6c84b23d26f4b5721f2eb5b8ca62af..e282aa8e1a263c8579c0e94ef5a88b91ec588dc5 100644
--- a/chrome/browser/ui/app_list/search/app_result.cc
+++ b/chrome/browser/ui/app_list/search/app_result.cc
@@ -38,8 +38,12 @@ AppResult::AppResult(Profile* profile,
controller_(controller),
extension_registry_(NULL) {
set_id(extensions::Extension::GetBaseURLFromExtensionId(app_id_).spec());
+#if !defined(USE_ATHENA)
+ // TODO(mukai): Athena also needs to use tile-styled search results for apps.
+ // Implement it and then remove this ifdef.
if (app_list::switches::IsExperimentalAppListEnabled())
set_display_type(DISPLAY_TILE);
+#endif
const extensions::Extension* extension =
extensions::ExtensionSystem::Get(profile_)->extension_service()
« no previous file with comments | « athena/test/base/athena_test_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698