[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/infobars/infobar_delegate.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_INFOBARS_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 60 matching lines @@
   // Returns true if the InfoBar should be closed automatically after the page
   // is navigated. By default this returns true if the navigation is to a new
   // page (not including reloads).  Subclasses wishing to change this behavior
   // can override either this function or ShouldExpireInternal(), depending on
   // what level of control they need.
   virtual bool ShouldExpire(const content::LoadCommittedDetails& details) const;
 
   // Called when the user clicks on the close button to dismiss the infobar.
   virtual void InfoBarDismissed();
 
+  // 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;
+
   // Return the icon to be shown for this InfoBar. If the returned Image is
   // NULL, no icon is shown.
-  virtual gfx::Image* GetIcon() const;
+  gfx::Image* GetIcon() const;

[tfarina, 2013/05/11 00:44:23]

if you kept the virtual, you could annotate this method as FINAL (see
base/compiler_specific.h), but if seems it doesn't need to be virtual anymore.

[gone, 2013/05/11 00:48:24]

Yeah, it turns out that all of the GetIcon() calls were doing the exact same
thing, but with different resource IDs.  I thought it would make more sense to
make that part of it virtual (in GetIconID()) and move the loading call here.

 
   // Returns the type of the infobar.  The type determines the appearance (such
   // as background color) of the infobar.
   virtual Type GetInfoBarType() const;
 
   // Type-checking downcast routines:
   virtual AutoLoginInfoBarDelegate* AsAutoLoginInfoBarDelegate();
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();
   virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate();
   virtual InsecureContentInfoBarDelegate* AsInsecureContentInfoBarDelegate();
@@ skipping 34 matching lines @@
   // opened for. Used to help expire on navigations.
   int contents_unique_id_;
 
   // TODO(pkasting): Remove.
   InfoBarService* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_