Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / collected_cookies_infobar_delegate.cc

diff --git a/src/chrome/browser/ui/collected_cookies_infobar_delegate.cc b/src/chrome/browser/ui/collected_cookies_infobar_delegate.cc
index b60761e..d1c8174 100644 (file)
--- a/src/chrome/browser/ui/collected_cookies_infobar_delegate.cc
+++ b/src/chrome/browser/ui/collected_cookies_infobar_delegate.cc
@@ -6,21 +6,22 @@
 
 #include "base/logging.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
 void CollectedCookiesInfoBarDelegate::Create(InfoBarService* infobar_service) {
-  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
-      new CollectedCookiesInfoBarDelegate(infobar_service)));
+  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(
+          new CollectedCookiesInfoBarDelegate())));
 }
 
-CollectedCookiesInfoBarDelegate::CollectedCookiesInfoBarDelegate(
-    InfoBarService* infobar_service)
-    : ConfirmInfoBarDelegate(infobar_service) {
+CollectedCookiesInfoBarDelegate::CollectedCookiesInfoBarDelegate()
+    : ConfirmInfoBarDelegate() {
 }
 
 CollectedCookiesInfoBarDelegate::~CollectedCookiesInfoBarDelegate() {
@@ -30,11 +31,12 @@ int CollectedCookiesInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_COOKIE;
 }
 
-InfoBarDelegate::Type CollectedCookiesInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type
+CollectedCookiesInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
-string16 CollectedCookiesInfoBarDelegate::GetMessageText() const {
+base::string16 CollectedCookiesInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_INFOBAR_MESSAGE);
 }
 
@@ -42,13 +44,15 @@ int CollectedCookiesInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
-string16 CollectedCookiesInfoBarDelegate::GetButtonLabel(
+base::string16 CollectedCookiesInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   DCHECK_EQ(BUTTON_OK, button);
   return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_INFOBAR_BUTTON);
 }
 
 bool CollectedCookiesInfoBarDelegate::Accept() {
-  web_contents()->GetController().Reload(true);
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  web_contents->GetController().Reload(true);
   return true;
 }