Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/three_d_api_observer.cc

 // 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/three_d_api_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // ThreeDAPIInfoBarDelegate ---------------------------------------------------
 
 class ThreeDAPIInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a 3D API infobar and delegate and adds the infobar to
-  // |infobar_service|.
+  // Creates a 3D API infobar delegate and adds it to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      const GURL& url,
                      content::ThreeDAPIType requester);
 
  private:
   enum DismissalHistogram {
     IGNORED,
     RELOADED,
     CLOSED_WITHOUT_ACTION,
     DISMISSAL_MAX
   };
 
-  ThreeDAPIInfoBarDelegate(const GURL& url, content::ThreeDAPIType requester);
+  ThreeDAPIInfoBarDelegate(InfoBarService* owner,
+                           const GURL& url,
+                           content::ThreeDAPIType requester);
   virtual ~ThreeDAPIInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual bool EqualsDelegate(InfoBarDelegate* delegate) const OVERRIDE;
   virtual ThreeDAPIInfoBarDelegate* AsThreeDAPIInfoBarDelegate() OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   GURL url_;
   content::ThreeDAPIType requester_;
   // Basically indicates whether the infobar was displayed at all, or
   // was a temporary instance thrown away by the InfobarService.
   mutable bool message_text_queried_;
   bool action_taken_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreeDAPIInfoBarDelegate);
 };
 
 // static
 void ThreeDAPIInfoBarDelegate::Create(InfoBarService* infobar_service,
                                       const GURL& url,
                                       content::ThreeDAPIType requester) {
   if (!infobar_service)
     return;  // NULL for apps.
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new ThreeDAPIInfoBarDelegate(url, requester))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new ThreeDAPIInfoBarDelegate(infobar_service, url, requester)));
 }
 
 ThreeDAPIInfoBarDelegate::ThreeDAPIInfoBarDelegate(
+    InfoBarService* owner,
     const GURL& url,
     content::ThreeDAPIType requester)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(owner),
       url_(url),
       requester_(requester),
       message_text_queried_(false),
       action_taken_(false) {
 }
 
 ThreeDAPIInfoBarDelegate::~ThreeDAPIInfoBarDelegate() {
   if (message_text_queried_ && !action_taken_) {
     UMA_HISTOGRAM_ENUMERATION("GPU.ThreeDAPIInfoBarDismissal",
                               CLOSED_WITHOUT_ACTION, DISMISSAL_MAX);
@@ skipping 80 matching lines @@
 
 void ThreeDAPIObserver::DidBlock3DAPIs(const GURL& url,
                                        int render_process_id,
                                        int render_view_id,
                                        content::ThreeDAPIType requester) {
   content::WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_id, render_view_id);
   ThreeDAPIInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents), url, requester);
 }