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

chrome/browser/extensions/external_install_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/external_install_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.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/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 namespace extensions {
 
 namespace {
 
 // Whether the external extension can use the streamlined bubble install flow.
 bool UseBubbleInstall(const Extension* extension, bool is_new_profile) {
   return extension->UpdatesFromGallery() && !is_new_profile;
 }
 
@@ skipping 43 matching lines @@
 
   const Extension* extension() const { return extension_; }
 
   // 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 GetBubbleViewIcon() 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;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
@@ skipping 12 matching lines @@
   ExternalInstallGlobalError(ExtensionService* service,
                              const Extension* extension);
   virtual ~ExternalInstallGlobalError();
 
   void set_prompt(const ExtensionInstallPrompt::Prompt& prompt) {
     prompt_ = &prompt;
   }
 
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
   virtual bool HasBubbleView() OVERRIDE;
+  virtual gfx::Image GetBubbleViewIcon() 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;
 
  protected:
   // Ref-counted, but needs to be disposed of if we are dismissed without
@@ skipping 91 matching lines @@
   return l10n_util::GetStringFUTF16(id, UTF8ToUTF16(extension_->name()));
 }
 
 void ExternalInstallMenuAlert::ExecuteMenuItem(Browser* browser) {
   ShowExternalInstallDialog(service_, browser, extension_);
 }
 
 bool ExternalInstallMenuAlert::HasBubbleView() {
   return false;
 }
+
+gfx::Image ExternalInstallMenuAlert::GetBubbleViewIcon() {
+  return gfx::Image();
+}
+
 string16 ExternalInstallMenuAlert::GetBubbleViewTitle() {
   return string16();
 }
 
 std::vector<string16> ExternalInstallMenuAlert::GetBubbleViewMessages() {
   return std::vector<string16>();
 }
 
 string16 ExternalInstallMenuAlert::GetBubbleViewAcceptButtonLabel() {
   return string16();
@@ skipping 56 matching lines @@
 }
 
 void ExternalInstallGlobalError::ExecuteMenuItem(Browser* browser) {
   ShowBubbleView(browser);
 }
 
 bool ExternalInstallGlobalError::HasBubbleView() {
   return true;
 }
 
+gfx::Image ExternalInstallGlobalError::GetBubbleViewIcon() {
+  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INPUT_ALERT);
+}
+
 string16 ExternalInstallGlobalError::GetBubbleViewTitle() {
   return prompt_->GetDialogTitle();
 }
 
 std::vector<string16> ExternalInstallGlobalError::GetBubbleViewMessages() {
   std::vector<string16> messages;
   messages.push_back(prompt_->GetHeading());
   if (prompt_->GetPermissionCount()) {
     messages.push_back(prompt_->GetPermissionsHeading());
     for (size_t i = 0; i < prompt_->GetPermissionCount(); ++i) {
@@ skipping 83 matching lines @@
 
 bool HasExternalInstallBubble(ExtensionService* service) {
   GlobalErrorService* error_service =
       GlobalErrorServiceFactory::GetForProfile(service->profile());
   GlobalError* error = error_service->GetGlobalErrorByMenuItemCommandID(
       kMenuCommandId);
   return error && error->HasBubbleView();
 }
 
 }  // namespace extensions