Add custom icon support to GlobalError. Show extension icon in permissions increase bubble.

chrome/browser/extensions/extension_disabled_ui.cc

 // Copyright (c) 2012 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/extensions/extension_disabled_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/size.h"
 
 using extensions::Extension;
 
 namespace {
 
 static base::LazyInstance<
     std::bitset<IDC_EXTENSION_DISABLED_LAST -
                 IDC_EXTENSION_DISABLED_FIRST + 1> >
     menu_command_ids = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 76 matching lines @@
   Release();
 }
 
 // ExtensionDisabledGlobalError -----------------------------------------------
 
 class ExtensionDisabledGlobalError : public GlobalError,
                                      public content::NotificationObserver,
                                      public ExtensionUninstallDialog::Delegate {
  public:
   ExtensionDisabledGlobalError(ExtensionService* service,
-                               const Extension* extension);
+                               const Extension* extension,
+                               const gfx::Image& icon);
   virtual ~ExtensionDisabledGlobalError();
 
   // GlobalError implementation.
   virtual Severity GetSeverity() OVERRIDE;
   virtual bool HasMenuItem() OVERRIDE;
   virtual int MenuItemCommandID() OVERRIDE;
   virtual string16 MenuItemLabel() OVERRIDE;
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
   virtual bool HasBubbleView() OVERRIDE;
+  virtual gfx::Image* GetBubbleViewCustomIcon() OVERRIDE;
   virtual string16 GetBubbleViewTitle() OVERRIDE;
   virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
   virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
   virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
   virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
   virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
   virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate implementation.
   virtual void ExtensionUninstallAccepted() OVERRIDE;
   virtual void ExtensionUninstallCanceled() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   ExtensionService* service_;
   const Extension* extension_;
+  gfx::Image icon_;
 
   // How the user responded to the error; used for metrics.
   enum UserResponse {
     IGNORED,
     REENABLE,
     UNINSTALL,
     EXTENSION_DISABLED_UI_BUCKET_BOUNDARY
   };
   UserResponse user_response_;
 
   scoped_ptr<ExtensionUninstallDialog> uninstall_dialog_;
 
   // Menu command ID assigned for this extension's error.
   int menu_command_id_;
 
   content::NotificationRegistrar registrar_;
 };
 
 // TODO(yoz): create error at startup for disabled extensions.
 ExtensionDisabledGlobalError::ExtensionDisabledGlobalError(
     ExtensionService* service,
-    const Extension* extension)
+    const Extension* extension,
+    const gfx::Image& icon)
     : service_(service),
       extension_(extension),
+      icon_(icon),
       user_response_(IGNORED),
       menu_command_id_(GetMenuCommandID()) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(service->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(service->profile()));
 }
 
 ExtensionDisabledGlobalError::~ExtensionDisabledGlobalError() {
   ReleaseMenuCommandID(menu_command_id_);
@@ skipping 20 matching lines @@
 }
 
 void ExtensionDisabledGlobalError::ExecuteMenuItem(Browser* browser) {
   ShowBubbleView(browser);
 }
 
 bool ExtensionDisabledGlobalError::HasBubbleView() {
    return true;
 }
 
+gfx::Image* ExtensionDisabledGlobalError::GetBubbleViewCustomIcon() {
+  if (icon_.IsEmpty())
+    return NULL;
+  return &icon_;
+}
+
 string16 ExtensionDisabledGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringFUTF16(IDS_EXTENSION_DISABLED_ERROR_TITLE,
                                     UTF8ToUTF16(extension_->name()));
 }
 
 std::vector<string16> ExtensionDisabledGlobalError::GetBubbleViewMessages() {
   std::vector<string16> messages;
   messages.push_back(l10n_util::GetStringFUTF16(
       extension_->is_app() ?
       IDS_APP_DISABLED_ERROR_LABEL : IDS_EXTENSION_DISABLED_ERROR_LABEL,
@@ skipping 74 matching lines @@
     else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED)
       user_response_ = UNINSTALL;
     delete this;
   }
 }
 
 // Globals --------------------------------------------------------------------
 
 namespace extensions {
 
+void AddExtensionDisabledErrorWithIcon(ExtensionService* service,
+                                       const Extension* extension,
+                                       const gfx::Image& icon) {
+  GlobalErrorServiceFactory::GetForProfile(service->profile())->
+      AddGlobalError(new ExtensionDisabledGlobalError(
+          service, extension, icon));
+}
+
 void AddExtensionDisabledError(ExtensionService* service,
                                const Extension* extension) {
-  GlobalErrorServiceFactory::GetForProfile(service->profile())->
-      AddGlobalError(new ExtensionDisabledGlobalError(service, extension));
+  extensions::ExtensionResource image = extensions::IconsInfo::GetIconResource(
+      extension,
+      extension_misc::EXTENSION_ICON_SMALL,
+      ExtensionIconSet::MATCH_BIGGER);
+  gfx::Size size(extension_misc::EXTENSION_ICON_SMALL,
+                 extension_misc::EXTENSION_ICON_SMALL);
+  ImageLoader::Get(service->profile())->LoadImageAsync(
+      extension, image, size,
+      base::Bind(&AddExtensionDisabledErrorWithIcon, service, extension));

[Matt Perry, 2013/05/24 00:24:04]

What happens if |service| or |extension| get deleted before the task is run? I
think you need to:
- Use a WeakPtr for the ExtensionService.
- Pass the extension ID and look it up again when the task runs.

[Yoyo Zhou, 2013/05/24 00:47:11]

Done.

 }
 
 void ShowExtensionDisabledDialog(ExtensionService* service,
                                  content::WebContents* web_contents,
                                  const Extension* extension) {
   scoped_ptr<ExtensionInstallPrompt> install_ui(
       new ExtensionInstallPrompt(web_contents));
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(service, install_ui.Pass(), extension);
 }
 
 }  // namespace extensions