Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/infobars/confirm_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_CONFIRM_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_INFOBARS_CONFIRM_INFOBAR_DELEGATE_H_
 
-#include "base/memory/scoped_ptr.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 
-class InfoBar;
-
 // An interface derived from InfoBarDelegate implemented by objects wishing to
 // control a ConfirmInfoBar.
 class ConfirmInfoBarDelegate : public InfoBarDelegate {
  public:
   enum InfoBarButton {
     BUTTON_NONE   = 0,
     BUTTON_OK     = 1 << 0,
     BUTTON_CANCEL = 1 << 1,
   };
 
@@ skipping 30 matching lines @@
   virtual string16 GetLinkText() const;
 
   // Called when the Link (if any) is clicked. The |disposition| specifies how
   // the resulting document should be loaded (based on the event flags present
   // when the link was clicked). If this function returns true, the infobar is
   // then immediately closed. Subclasses MUST NOT return true if in handling
   // this call something triggers the infobar to begin closing.
   virtual bool LinkClicked(WindowOpenDisposition disposition);
 
  protected:
-  ConfirmInfoBarDelegate();
-
-  // Returns a confirm infobar that owns |delegate|.
-  static scoped_ptr<InfoBar> CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate> delegate);
+  explicit ConfirmInfoBarDelegate(InfoBarService* infobar_service);
 
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const OVERRIDE;
 
  private:
   // InfoBarDelegate:
+  virtual InfoBar* CreateInfoBar(InfoBarService* owner) OVERRIDE;
   virtual bool EqualsDelegate(InfoBarDelegate* delegate) const OVERRIDE;
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_CONFIRM_INFOBAR_DELEGATE_H_