Cleanup:...

chrome/browser/tab_contents/infobar_delegate.h

 // Copyright (c) 2011 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_TAB_CONTENTS_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "webkit/glue/window_open_disposition.h"
 
-class AlertInfoBarDelegate;
 class ConfirmInfoBarDelegate;
 class CrashedExtensionInfoBarDelegate;
 class ExtensionInfoBarDelegate;
 class InfoBar;
 class LinkInfoBarDelegate;
 class SkBitmap;
 class ThemeInstalledInfoBarDelegate;
 class TranslateInfoBarDelegate;
 
 // An interface implemented by objects wishing to control an InfoBar.
 // Implementing this interface is not sufficient to use an InfoBar, since it
 // does not map to a specific InfoBar type. Instead, you must implement either
-// AlertInfoBarDelegate or ConfirmInfoBarDelegate, or override with your own
+// LinkInfoBarDelegate or ConfirmInfoBarDelegate, or override with your own
 // delegate for your own InfoBar variety.
 //
 // --- WARNING ---
 // When creating your InfoBarDelegate subclass, it is recommended that you
 // design it such that you instantiate a brand new delegate for every call to
 // AddInfoBar, rather than re-using/sharing a delegate object. Otherwise,
 // you need to consider the fact that more than one InfoBar instance can exist
 // and reference the same delegate -- even though it is also true that we only
 // ever fully show one infobar (they don't stack). The dual-references occur
 // because a second InfoBar can be added while the first one is in the process
@@ skipping 43 matching lines @@
 
   // Return the icon to be shown for this InfoBar. If the returned bitmap is
   // NULL, no icon is shown.
   virtual SkBitmap* GetIcon() 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 AlertInfoBarDelegate* AsAlertInfoBarDelegate();
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();
   virtual CrashedExtensionInfoBarDelegate* AsCrashedExtensionInfoBarDelegate();
   virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate();
   virtual LinkInfoBarDelegate* AsLinkInfoBarDelegate();
   virtual ThemeInstalledInfoBarDelegate* AsThemePreviewInfobarDelegate();
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate();
 
  protected:
   // Provided to subclasses as a convenience to initialize the state of this
   // object. If |contents| is non-NULL, its active entry's unique ID will be
   // stored using StoreActiveEntryUniqueID automatically.
   explicit InfoBarDelegate(TabContents* contents);
 
   // Store the unique id for the active entry in the specified TabContents, to
   // be used later upon navigation to determine if this InfoBarDelegate should
   // be expired from |contents_|.
   void StoreActiveEntryUniqueID(TabContents* contents);
 
  private:
   // The unique id of the active NavigationEntry of the TabContents that we were
   // opened for. Used to help expire on navigations.
   int contents_unique_id_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
 // An interface derived from InfoBarDelegate implemented by objects wishing to
-// control an AlertInfoBar.
-class AlertInfoBarDelegate : public InfoBarDelegate {
- public:
-  // Returns the message string to be displayed for the InfoBar.
-  virtual string16 GetMessageText() const = 0;
-
-  // InfoBarDelegate:
-  virtual InfoBar* CreateInfoBar();
-  virtual bool EqualsDelegate(InfoBarDelegate* delegate) const;
-
- protected:
-  explicit AlertInfoBarDelegate(TabContents* contents);
-  virtual ~AlertInfoBarDelegate();
-
- private:
-  virtual AlertInfoBarDelegate* AsAlertInfoBarDelegate();
-
-  DISALLOW_COPY_AND_ASSIGN(AlertInfoBarDelegate);
-};
-
-// An interface derived from InfoBarDelegate implemented by objects wishing to
 // control a LinkInfoBar.
 class LinkInfoBarDelegate : public InfoBarDelegate {
  public:
   // Returns the message string to be displayed in the InfoBar. |link_offset|
   // is the position where the link should be inserted. If |link_offset| is set
   // to string16::npos (it is by default), the link is right aligned within
   // the InfoBar rather than being embedded in the message text.
   virtual string16 GetMessageTextWithOffset(size_t* link_offset) const;
 
   // Returns the text of the link to be displayed.
@@ skipping 13 matching lines @@
  private:
   // InfoBarDelegate:
   virtual InfoBar* CreateInfoBar();
   virtual LinkInfoBarDelegate* AsLinkInfoBarDelegate();
 
   DISALLOW_COPY_AND_ASSIGN(LinkInfoBarDelegate);
 };
 
 // An interface derived from InfoBarDelegate implemented by objects wishing to
 // control a ConfirmInfoBar.
-class ConfirmInfoBarDelegate : public AlertInfoBarDelegate {
+class ConfirmInfoBarDelegate : public InfoBarDelegate {
  public:
   enum InfoBarButton {
-    BUTTON_NONE       = 0,
-    BUTTON_OK         = 1 << 0,
-    BUTTON_CANCEL     = 1 << 1,
+    BUTTON_NONE   = 0,
+    BUTTON_OK     = 1 << 0,
+    BUTTON_CANCEL = 1 << 1,
   };
 
+  // Returns the message string to be displayed for the InfoBar.
+  virtual string16 GetMessageText() const = 0;
+
   // Return the buttons to be shown for this InfoBar.
   virtual int GetButtons() const;
 
   // Return the label for the specified button. The default implementation
   // returns "OK" for the OK button and "Cancel" for the Cancel button.
   virtual string16 GetButtonLabel(InfoBarButton button) const;
 
   // Return whether or not the specified button needs elevation.
   virtual bool NeedElevation(InfoBarButton button) const;
 
@@ skipping 17 matching lines @@
   // Will only be called if GetLinkText() returns non-empty string.
   virtual bool LinkClicked(WindowOpenDisposition disposition);
 
  protected:
   explicit ConfirmInfoBarDelegate(TabContents* contents);
   virtual ~ConfirmInfoBarDelegate();
 
  private:
   // InfoBarDelegate:
   virtual InfoBar* CreateInfoBar();
+  virtual bool EqualsDelegate(InfoBarDelegate* delegate) const;
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate);
 };
 
 // Simple implementations for common use cases ---------------------------------
 
-class SimpleAlertInfoBarDelegate : public AlertInfoBarDelegate {
+class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   SimpleAlertInfoBarDelegate(TabContents* contents,
                              SkBitmap* icon,  // May be NULL.
                              const string16& message,
                              bool auto_expire);
 
  private:
   virtual ~SimpleAlertInfoBarDelegate();
 
-  // AlertInfoBarDelegate:
+  // ConfirmInfoBarDelegate:
   virtual bool ShouldExpire(
       const NavigationController::LoadCommittedDetails& details) const;
   virtual void InfoBarClosed();
   virtual SkBitmap* GetIcon() const;
   virtual string16 GetMessageText() const;
+  virtual int GetButtons() const;
 
   SkBitmap* icon_;
   string16 message_;
   bool auto_expire_;  // Should it expire automatically on navigation?
 
   DISALLOW_COPY_AND_ASSIGN(SimpleAlertInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_