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..f3093e7c13804634174934c4c9f3aa9dd55ca194 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,6 +54,9 @@ class GlobalError : public base::SupportsWeakPtr<GlobalError> {
   void ShowBubbleView(Browser* browser);
   // Returns the bubble view.
   virtual GlobalErrorBubbleViewBase* GetBubbleView();
+  // Returns a custom icon to use for the bubble view. If NULL, the
+  // bubble view uses GetBubbleViewIconResourceID instead.
+  virtual gfx::Image* GetBubbleViewCustomIcon();

[sail, 2013/05/24 22:15:02]

Return by value instead. Callers can use IsEmpty() to check for a invalid image.

[Yoyo Zhou, 2013/05/28 21:58:02]

Done.

   // Returns the resource ID for bubble view icon.
   int GetBubbleViewIconResourceID();

[sail, 2013/05/24 22:15:02]

this should be removed.

[Yoyo Zhou, 2013/05/28 18:21:34]

What do you think about making it a static GetDefaultBubbleViewIconResourceID
and using that if the custom icon IsEmpty?

[sail, 2013/05/28 18:39:50]

I think it's best to just have a simple API. I don't think having to fallback to
to the resource ID is helpful.

[Yoyo Zhou, 2013/05/28 21:58:02]

OK. I changed the API to gfx::Image GetBubbleViewIcon().

   // Returns the title for the bubble view.