Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm

 // 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.
 
 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h"
 
 #import <AppKit/AppKit.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class SkBitmap;
 
 namespace {
 
 // KeystonePromotionInfoBarDelegate -------------------------------------------
 
 class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // If there's an active tab, creates a keystone promotion delegate and adds it
   // to the InfoBarService associated with that tab.
   static void Create();
 
  private:
-  explicit KeystonePromotionInfoBarDelegate(PrefService* prefs);
+  KeystonePromotionInfoBarDelegate(InfoBarService* infobar_service,
+                                   PrefService* prefs);
   virtual ~KeystonePromotionInfoBarDelegate();
 
   // Sets this info bar to be able to expire.  Called a predetermined amount
   // of time after this object is created.
   void SetCanExpire() { can_expire_ = true; }
 
   // ConfirmInfoBarDelegate
   virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ skipping 18 matching lines @@
 void KeystonePromotionInfoBarDelegate::Create() {
   Browser* browser = chrome::GetLastActiveBrowser();
   if (!browser)
     return;
   content::WebContents* webContents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!webContents)
     return;
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(webContents);
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new KeystonePromotionInfoBarDelegate(
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new KeystonePromotionInfoBarDelegate(
+          infobar_service,
           Profile::FromBrowserContext(
-              webContents->GetBrowserContext())->GetPrefs()))));
+              webContents->GetBrowserContext())->GetPrefs())));
 }
 
 KeystonePromotionInfoBarDelegate::KeystonePromotionInfoBarDelegate(
+    InfoBarService* infobar_service,
     PrefService* prefs)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       prefs_(prefs),
       can_expire_(false),
       weak_ptr_factory_(this) {
   const base::TimeDelta kCanExpireOnNavigationAfterDelay =
       base::TimeDelta::FromSeconds(8);
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&KeystonePromotionInfoBarDelegate::SetCanExpire,
                  weak_ptr_factory_.GetWeakPtr()),
       kCanExpireOnNavigationAfterDelay);
 }
@@ skipping 114 matching lines @@
 
 @end  // @implementation KeystonePromotionInfoBar
 
 // static
 void KeystoneInfoBar::PromotionInfoBar(Profile* profile) {
   KeystonePromotionInfoBar* promotionInfoBar =
       [[[KeystonePromotionInfoBar alloc] init] autorelease];
 
   [promotionInfoBar checkAndShowInfoBarForProfile:profile];
 }