Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc b/src/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
index f51f741..0440384 100644 (file)
--- a/src/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
+++ b/src/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -15,13 +16,13 @@
 
 // static
 void WebsiteSettingsInfoBarDelegate::Create(InfoBarService* infobar_service) {
-  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
-      new WebsiteSettingsInfoBarDelegate(infobar_service)));
+  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(
+          new WebsiteSettingsInfoBarDelegate())));
 }
 
-WebsiteSettingsInfoBarDelegate::WebsiteSettingsInfoBarDelegate(
-    InfoBarService* infobar_service)
-    : ConfirmInfoBarDelegate(infobar_service) {
+WebsiteSettingsInfoBarDelegate::WebsiteSettingsInfoBarDelegate()
+    : ConfirmInfoBarDelegate() {
 }
 
 WebsiteSettingsInfoBarDelegate::~WebsiteSettingsInfoBarDelegate() {
@@ -31,11 +32,12 @@ int WebsiteSettingsInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_ALT_NAV_URL;
 }
 
-InfoBarDelegate::Type WebsiteSettingsInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type WebsiteSettingsInfoBarDelegate::GetInfoBarType()
+    const {
   return PAGE_ACTION_TYPE;
 }
 
-string16 WebsiteSettingsInfoBarDelegate::GetMessageText() const {
+base::string16 WebsiteSettingsInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INFOBAR_TEXT);
 }
 
@@ -43,13 +45,15 @@ int WebsiteSettingsInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
-string16 WebsiteSettingsInfoBarDelegate::GetButtonLabel(
+base::string16 WebsiteSettingsInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   DCHECK_EQ(BUTTON_OK, button);
   return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INFOBAR_BUTTON);
 }
 
 bool WebsiteSettingsInfoBarDelegate::Accept() {
-  web_contents()->GetController().Reload(true);
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  web_contents->GetController().Reload(true);
   return true;
 }