[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 29 matching lines @@
     PAGE_ACTION_TYPE,
   };
 
   enum InfoBarAutomationType {
     CONFIRM_INFOBAR,
     PASSWORD_INFOBAR,
     RPH_INFOBAR,
     UNKNOWN_INFOBAR,
   };
 
+  // Value to use when the InfoBar has no icon to show.
+  static const int kNoIconID = 0;

[Peter Kasting, 2013/05/15 21:47:43]

You may want to merely declare this here, and define it in the .cc file, in
order to prevent compilation issues on a few older compilers.  (This is our
typical pattern with Chrome constants.)

[gone, 2013/05/15 22:06:25]

Done.

+
   virtual ~InfoBarDelegate();
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const;
 
   // Called to create the InfoBar. Implementation of this method is
   // platform-specific.
   virtual InfoBar* CreateInfoBar(InfoBarService* owner) = 0;
 
   // TODO(pkasting): Move to InfoBar once InfoBars own their delegates.
   InfoBarService* owner() { return owner_; }
@@ skipping 11 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 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 equal to |kNoIconID|, 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.
   virtual Type GetInfoBarType() const;
 
   // Type-checking downcast routines:
   virtual AutoLoginInfoBarDelegate* AsAutoLoginInfoBarDelegate();
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();
   virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate();
   virtual InsecureContentInfoBarDelegate* AsInsecureContentInfoBarDelegate();
   virtual MediaStreamInfoBarDelegate* AsMediaStreamInfoBarDelegate();
   virtual RegisterProtocolHandlerInfoBarDelegate*
       AsRegisterProtocolHandlerInfoBarDelegate();
   virtual ScreenCaptureInfoBarDelegate* AsScreenCaptureInfoBarDelegate();
   virtual ThemeInstalledInfoBarDelegate* AsThemePreviewInfobarDelegate();
   virtual ThreeDAPIInfoBarDelegate* AsThreeDAPIInfoBarDelegate();
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate();
 
+  // Return the icon to be shown for this InfoBar. If the returned Image is
+  // empty, no icon is shown.
+  gfx::Image GetIcon() const;
+
   content::WebContents* web_contents() {
     return owner_ ? owner_->web_contents() : NULL;
   }
 
  protected:
   // If |contents| is non-NULL, its active entry's unique ID will be stored
   // using StoreActiveEntryUniqueID automatically.
   explicit InfoBarDelegate(InfoBarService* infobar_service);
 
   // Store the unique id for the active entry in our WebContents, to be used
@@ skipping 16 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_