Index: chrome/browser/three_d_api_observer.cc |
diff --git a/chrome/browser/three_d_api_observer.cc b/chrome/browser/three_d_api_observer.cc |
index 582da9381dcf55f18fd95b7a0d5ecc72898923ee..95095484825272ea298e26909819617ab766800d 100644 |
--- a/chrome/browser/three_d_api_observer.cc |
+++ b/chrome/browser/three_d_api_observer.cc |
@@ -5,7 +5,7 @@ |
#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/content_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" |
@@ -16,7 +16,7 @@ |
// ThreeDAPIInfoBarDelegate --------------------------------------------------- |
-class ThreeDAPIInfoBarDelegate : public ConfirmInfoBarDelegate { |
+class ThreeDAPIInfoBarDelegate : public ContentConfirmInfoBarDelegate { |
public: |
// Creates a 3D API infobar and delegate and adds the infobar to |
// |infobar_service|. |
@@ -32,7 +32,9 @@ class ThreeDAPIInfoBarDelegate : public ConfirmInfoBarDelegate { |
DISMISSAL_MAX |
}; |
- ThreeDAPIInfoBarDelegate(const GURL& url, content::ThreeDAPIType requester); |
+ ThreeDAPIInfoBarDelegate(content::WebContents* web_contents, |
+ const GURL& url, |
+ content::ThreeDAPIType requester); |
virtual ~ThreeDAPIInfoBarDelegate(); |
// ConfirmInfoBarDelegate: |
@@ -62,19 +64,19 @@ void ThreeDAPIInfoBarDelegate::Create(InfoBarService* infobar_service, |
if (!infobar_service) |
return; // NULL for apps. |
infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( |
- scoped_ptr<ConfirmInfoBarDelegate>( |
- new ThreeDAPIInfoBarDelegate(url, requester)))); |
+ scoped_ptr<ConfirmInfoBarDelegate>(new ThreeDAPIInfoBarDelegate( |
+ infobar_service->web_contents(), url, requester)))); |
} |
ThreeDAPIInfoBarDelegate::ThreeDAPIInfoBarDelegate( |
+ content::WebContents* web_contents, |
const GURL& url, |
content::ThreeDAPIType requester) |
- : ConfirmInfoBarDelegate(), |
+ : ContentConfirmInfoBarDelegate(web_contents), |
url_(url), |
requester_(requester), |
message_text_queried_(false), |
- action_taken_(false) { |
-} |
+ action_taken_(false) {} |
ThreeDAPIInfoBarDelegate::~ThreeDAPIInfoBarDelegate() { |
if (message_text_queried_ && !action_taken_) { |