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

chrome/browser/extensions/external_install_ui.cc

Index: chrome/browser/extensions/external_install_ui.cc
diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc
index 9f41c1fd4ab130306f253076b8b9306705007fb5..977d4bdee28a212393505ab4a0bcd9cc355fed60 100644
--- a/chrome/browser/extensions/external_install_ui.cc
+++ b/chrome/browser/extensions/external_install_ui.cc
@@ -35,6 +35,8 @@
 #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 {
 
@@ -98,6 +100,7 @@ class ExternalInstallMenuAlert : public GlobalError,
   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;
@@ -130,6 +133,7 @@ class ExternalInstallGlobalError : public ExternalInstallMenuAlert {
 
   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;
@@ -241,6 +245,11 @@ void ExternalInstallMenuAlert::ExecuteMenuItem(Browser* browser) {
 bool ExternalInstallMenuAlert::HasBubbleView() {
   return false;
 }
+
+gfx::Image ExternalInstallMenuAlert::GetBubbleViewIcon() {
+  return gfx::Image();
+}
+
 string16 ExternalInstallMenuAlert::GetBubbleViewTitle() {
   return string16();
 }
@@ -317,6 +326,11 @@ bool ExternalInstallGlobalError::HasBubbleView() {
   return true;
 }
 
+gfx::Image ExternalInstallGlobalError::GetBubbleViewIcon() {
+  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INPUT_ALERT);
+}
+
 string16 ExternalInstallGlobalError::GetBubbleViewTitle() {
   return prompt_->GetDialogTitle();
 }