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

chrome/browser/ui/global_error/global_error.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_
 #define CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 
 class Browser;
 class GlobalErrorBubbleViewBase;
 
+namespace gfx {
+class Image;
+}
+
 // This object describes a single global error.
 class GlobalError : public base::SupportsWeakPtr<GlobalError> {
  public:
   enum Severity {
     SEVERITY_LOW,
     SEVERITY_MEDIUM,
     SEVERITY_HIGH,
   };
 
   GlobalError();
@@ skipping 16 matching lines @@
   virtual void ExecuteMenuItem(Browser* browser) = 0;
 
   // Returns true if a bubble view should be shown.
   virtual bool HasBubbleView() = 0;
   // Returns true if the bubble view has been shown.
   virtual bool HasShownBubbleView();
   // Called to show the bubble view.
   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.
   virtual string16 GetBubbleViewTitle() = 0;
   // Returns the messages for the bubble view, one per line. Multiple messages
   // are only supported on Views.
   // TODO(yoz): Add multi-line support for GTK and Cocoa.
   virtual std::vector<string16> GetBubbleViewMessages() = 0;
   // Returns the accept button label for the bubble view.
   virtual string16 GetBubbleViewAcceptButtonLabel() = 0;
   // Returns the cancel button label for the bubble view. To hide the cancel
   // button return an empty string.
@@ skipping 13 matching lines @@
 
 
  private:
   bool has_shown_bubble_view_;
   GlobalErrorBubbleViewBase* bubble_view_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalError);
 };
 
 #endif  // CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_