Allow app list tiles to show search results in the experimental app list.

chrome/browser/ui/app_list/search/app_result.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/search/app_result.h"
 
 #include "base/time/time.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_context_menu.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/tokenized_string.h"
 #include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/constants.h"
 #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"
 
 namespace app_list {
 
 AppResult::AppResult(Profile* profile,
                      const std::string& app_id,
                      AppListControllerDelegate* controller)
     : profile_(profile),
       app_id_(app_id),
       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 !IsExperimentalAppListEnabled(). Still,
best to put it in an if statement so it's clear that it only affects
experimental.

(Otherwise, reading this code is confusing because it always sets DISPLAY_TILE
even though later it uses EXTENSION_ICON_SMALL.)

[calamity, 2014/08/12 05:03:36]

Done.

 
   const extensions::Extension* extension =
       extensions::ExtensionSystem::Get(profile_)->extension_service()
           ->GetInstalledExtension(app_id_);
   DCHECK(extension);
 
   is_platform_app_ = extension->is_platform_app();
 
   icon_.reset(new extensions::IconImage(
       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();
 
   StartObservingExtensionRegistry();
 }
 
 AppResult::~AppResult() {
   StopObservingExtensionRegistry();
 }
@@ skipping 149 matching lines @@
 
   NotifyItemUninstalled();
 }
 
 void AppResult::OnShutdown(extensions::ExtensionRegistry* registry) {
   DCHECK_EQ(extension_registry_, registry);
   StopObservingExtensionRegistry();
 }
 
 }  // namespace app_list