[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/infobars/infobar_delegate.h

Index: chrome/browser/infobars/infobar_delegate.h
diff --git a/chrome/browser/infobars/infobar_delegate.h b/chrome/browser/infobars/infobar_delegate.h
index 1fb7d632a9d9b1197125bcdeefbc3e1bd00099e3..d5f215aaed102aac80c9b1053ac026634e99fd40 100644
--- a/chrome/browser/infobars/infobar_delegate.h
+++ b/chrome/browser/infobars/infobar_delegate.h
@@ -78,9 +78,9 @@ class InfoBarDelegate {
   // Called when the user clicks on the close button to dismiss the infobar.
   virtual void InfoBarDismissed();
 
-  // Return the icon to be shown for this InfoBar. If the returned Image is
-  // NULL, no icon is shown.
-  virtual gfx::Image* GetIcon() const;
+  // Return the resource ID of the icon to be shown for this InfoBar.  If the
+  // value is -1, no icon is shown.
+  virtual int GetIconID() const;
 
   // Returns the type of the infobar.  The type determines the appearance (such
   // as background color) of the infobar.
@@ -103,6 +103,10 @@ class InfoBarDelegate {
     return owner_ ? owner_->web_contents() : NULL;
   }
 
+  // Return the icon to be shown for this InfoBar. If the returned Image is
+  // NULL, no icon is shown.

[sky, 2013/05/14 21:02:03]

nit: document ownership here.

Is there a reason we don't return a gfx::Image here? That way no worries about
ownership.

[gone, 2013/05/14 22:31:44]

I think it's because the ResourceBundle caches everything so that subsequent
loads of the same resource don't incur another loading penalty.  Added a comment
to that effect.

On 2013/05/14 21:02:03, sky wrote:

[Peter Kasting, 2013/05/15 00:18:52]

How does returning an Image instead of an Image* make much difference to that,
though?

Ans aren't Images supposed to be cheap to copy (because they refcount the
important underlying data)?

I'm a fan of not returning pointer types unless we have to; I didn't focus on it
because this wasn't a change from the old code, but perhaps it's worth looking
at since you're touching this anyway.

+  gfx::Image* GetIcon() const;
+
  protected:
   // If |contents| is non-NULL, its active entry's unique ID will be stored
   // using StoreActiveEntryUniqueID automatically.