Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/src/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
index 42f1d55..edea11a 100644 (file)
--- a/src/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+++ b/src/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
@@ -5,10 +5,11 @@
 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h"
 
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/grit/chromium_strings.h"
+#include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/google_api_keys.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
@@ -17,19 +18,18 @@ void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
   if (google_apis::HasKeysConfigured())
     return;
 
-  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
-      new GoogleApiKeysInfoBarDelegate(infobar_service)));
+  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(new GoogleApiKeysInfoBarDelegate())));
 }
 
-GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate(
-    InfoBarService* infobar_service)
-    : ConfirmInfoBarDelegate(infobar_service) {
+GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate()
+    : ConfirmInfoBarDelegate() {
 }
 
 GoogleApiKeysInfoBarDelegate::~GoogleApiKeysInfoBarDelegate() {
 }
 
-string16 GoogleApiKeysInfoBarDelegate::GetMessageText() const {
+base::string16 GoogleApiKeysInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_MISSING_GOOGLE_API_KEYS);
 }
 
@@ -37,16 +37,17 @@ int GoogleApiKeysInfoBarDelegate::GetButtons() const {
   return BUTTON_NONE;
 }
 
-string16 GoogleApiKeysInfoBarDelegate::GetLinkText() const {
+base::string16 GoogleApiKeysInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool GoogleApiKeysInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-  web_contents()->OpenURL(content::OpenURLParams(
-      GURL("http://www.chromium.org/developers/how-tos/api-keys"),
-      content::Referrer(),
-      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
-      content::PAGE_TRANSITION_LINK, false));
+  InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
+      content::OpenURLParams(
+          GURL("http://www.chromium.org/developers/how-tos/api-keys"),
+          content::Referrer(),
+          (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+          ui::PAGE_TRANSITION_LINK, false));
   return false;
 }