Refactor extension app icon.

chrome/browser/ui/app_list/search/extension_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/extension_app_result.h"
 
 #include "base/metrics/user_metrics.h"
+#include "chrome/browser/chromeos/extensions/gfx_utils.h"

[Devlin, 2017/05/01 14:51:11]

needed?

[khmel, 2017/05/01 20:18:19]

nice catch

+#include "chrome/browser/extensions/extension_app_icon.h"
+#include "chrome/browser/extensions/extension_app_icon_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/extension_app_context_menu.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/common/extensions/extension_metrics.h"
 #include "extensions/browser/extension_registry.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/events/event_constants.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image_skia_operations.h"
-#include "chrome/browser/chromeos/extensions/gfx_utils.h"
 
 namespace app_list {
 
 ExtensionAppResult::ExtensionAppResult(Profile* profile,
                                        const std::string& app_id,
                                        AppListControllerDelegate* controller,
                                        bool is_recommendation)
     : AppResult(profile, app_id, controller, is_recommendation) {
   set_id(extensions::Extension::GetBaseURLFromExtensionId(app_id).spec());
 
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension(
           app_id);
   DCHECK(extension);
 
   is_platform_app_ = extension->is_platform_app();
-
-  CreateOrUpdateIcon();
+  icon_ = extensions::ExtensionAppIconService::Get(profile)->CreateIcon(
+      this, app_id, GetPreferredIconDimension());
 
   StartObservingExtensionRegistry();
 }
 
 ExtensionAppResult::~ExtensionAppResult() {
   StopObservingExtensionRegistry();
 }
 
-void ExtensionAppResult::CreateOrUpdateIcon() {
-  if (icon_ && icon_->is_valid()) {
-    UpdateIcon();
-    return;
-  }
-
-  const extensions::Extension* extension =
-      extensions::ExtensionRegistry::Get(profile())->GetInstalledExtension(
-          app_id());
-  DCHECK(extension);
-
-  icon_ = base::MakeUnique<extensions::IconImage>(
-      profile(), extension, extensions::IconsInfo::GetIcons(extension),
-      GetPreferredIconDimension(), extensions::util::GetDefaultAppIcon(), this);
-  UpdateIcon();
-}
-
 void ExtensionAppResult::Open(int event_flags) {
   RecordHistogram(APP_SEARCH_RESULT);
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile())->GetInstalledExtension(
           app_id());
   if (!extension)
     return;
 
   // Don't auto-enable apps that cannot be launched.
   if (!extensions::util::IsAppLaunchable(app_id(), profile()))
@@ skipping 57 matching lines @@
     controller()->OnShowChildDialog();
 
     extension_enable_flow_.reset(new ExtensionEnableFlow(
         profile(), app_id(), this));
     extension_enable_flow_->StartForNativeWindow(
         controller()->GetAppListWindow());
   }
   return true;
 }
 
-void ExtensionAppResult::UpdateIcon() {
-  gfx::ImageSkia icon = icon_->image_skia();
-
-  extensions::util::MaybeApplyChromeBadge(profile(), app_id(), &icon);
-
-  if (!extensions::util::IsAppLaunchable(app_id(), profile())) {
-    const color_utils::HSL shift = {-1, 0, 0.6};
-    icon = gfx::ImageSkiaOperations::CreateHSLShiftedImage(icon, shift);
-  }
-
-  SetIcon(icon);
-}
-
-void ExtensionAppResult::OnExtensionIconImageChanged(
-    extensions::IconImage* image) {
-  DCHECK_EQ(icon_.get(), image);
-  UpdateIcon();
-}
-
-void ExtensionAppResult::OnExtensionIconImageDestroyed(
-    extensions::IconImage* image) {
-  SetIcon(gfx::ImageSkia());
+void ExtensionAppResult::OnIconUpdated(extensions::ExtensionAppIcon* icon) {
+  SetIcon(icon->image_skia());
 }
 
 void ExtensionAppResult::ExecuteLaunchCommand(int event_flags) {
   Open(event_flags);
 }
 
 void ExtensionAppResult::ExtensionEnableFlowFinished() {
   extension_enable_flow_.reset();
   controller()->OnCloseChildDialog();
 
   // Automatically open app after enabling.
   Open(ui::EF_NONE);
 }
 
 void ExtensionAppResult::ExtensionEnableFlowAborted(bool user_initiated) {
   extension_enable_flow_.reset();
   controller()->OnCloseChildDialog();
 }
 
 void ExtensionAppResult::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
   // Old |icon_| might be invalidated for forever in case extension gets
   // updated. In this case we need re-create icon again.
-  CreateOrUpdateIcon();
+  if (!icon_->IsValid())
+    icon_->Reload();
 }
 
 void ExtensionAppResult::OnShutdown(extensions::ExtensionRegistry* registry) {
   DCHECK_EQ(extension_registry_, registry);
   StopObservingExtensionRegistry();
 }
 
 }  // namespace app_list