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

chrome/browser/ui/global_error/global_error.h

Index: chrome/browser/ui/global_error/global_error.h
diff --git a/chrome/browser/ui/global_error/global_error.h b/chrome/browser/ui/global_error/global_error.h
index fe79ce326ae76d8c613b6f9697a5f1e28c4b5c98..805936eb7c0a00c0598d1acea00f98b56a8f9482 100644
--- a/chrome/browser/ui/global_error/global_error.h
+++ b/chrome/browser/ui/global_error/global_error.h
@@ -14,6 +14,10 @@
 class Browser;
 class GlobalErrorBubbleViewBase;
 
+namespace gfx {
+class Image;
+}
+
 // This object describes a single global error.
 class GlobalError : public base::SupportsWeakPtr<GlobalError> {
  public:
@@ -50,8 +54,8 @@ class GlobalError : public base::SupportsWeakPtr<GlobalError> {
   void ShowBubbleView(Browser* browser);
   // Returns the bubble view.
   virtual GlobalErrorBubbleViewBase* GetBubbleView();
-  // Returns the resource ID for bubble view icon.
-  int GetBubbleViewIconResourceID();
+  // Returns an icon to use for the bubble view.
+  virtual gfx::Image GetBubbleViewIcon();
   // Returns the title for the bubble view.
   virtual string16 GetBubbleViewTitle() = 0;
   // Returns the messages for the bubble view, one per line. Multiple messages