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

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

Issue 439703002: Allow app list tiles to show search results in the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « no previous file | ui/app_list/app_list_model.h » ('j') | ui/app_list/app_list_model.h » ('J')
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 54aaef38bd1172fd57d9919462c09cfe958c09f2..54229c020c6d9442df64d6b227b644a477dd2cb9 100644
--- a/chrome/browser/ui/app_list/search/app_result.cc
+++ b/chrome/browser/ui/app_list/search/app_result.cc
@@ -23,6 +23,7 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_icon_set.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
+#include "ui/app_list/app_list_switches.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia_operations.h"
@@ -36,6 +37,7 @@ AppResult::AppResult(Profile* profile,
controller_(controller),
extension_registry_(NULL) {
set_id(extensions::Extension::GetBaseURLFromExtensionId(app_id_).spec());
+ set_display_type(DISPLAY_TILE);
Matt Giuca 2014/08/06 08:54:53 I assume this will have no effect if !IsExperiment
calamity 2014/08/12 05:03:36 Done.
const extensions::Extension* extension =
extensions::ExtensionSystem::Get(profile_)->extension_service()
@@ -48,7 +50,9 @@ AppResult::AppResult(Profile* profile,
profile_,
extension,
extensions::IconsInfo::GetIcons(extension),
- extension_misc::EXTENSION_ICON_SMALL,
+ app_list::switches::IsExperimentalAppListEnabled()
+ ? extension_misc::EXTENSION_ICON_MEDIUM
+ : extension_misc::EXTENSION_ICON_SMALL,
extensions::util::GetDefaultAppIcon(),
this));
UpdateIcon();
« no previous file with comments | « no previous file | ui/app_list/app_list_model.h » ('j') | ui/app_list/app_list_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698