summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_request_infobar_delegate.cc10
-rw-r--r--chrome/browser/download/download_request_infobar_delegate.h4
-rw-r--r--chrome/browser/download/download_util.cc2
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/download/download_request_infobar_delegate.cc b/chrome/browser/download/download_request_infobar_delegate.cc
index 4a401bb..ecbc108 100644
--- a/chrome/browser/download/download_request_infobar_delegate.cc
+++ b/chrome/browser/download/download_request_infobar_delegate.cc
@@ -27,8 +27,8 @@ void DownloadRequestInfoBarDelegate::InfoBarClosed() {
ConfirmInfoBarDelegate::InfoBarClosed();
}
-std::wstring DownloadRequestInfoBarDelegate::GetMessageText() const {
- return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING);
+string16 DownloadRequestInfoBarDelegate::GetMessageText() const {
+ return l10n_util::GetStringUTF16(IDS_MULTI_DOWNLOAD_WARNING);
}
SkBitmap* DownloadRequestInfoBarDelegate::GetIcon() const {
@@ -40,12 +40,12 @@ int DownloadRequestInfoBarDelegate::GetButtons() const {
return BUTTON_OK | BUTTON_CANCEL;
}
-std::wstring DownloadRequestInfoBarDelegate::GetButtonLabel(
+string16 DownloadRequestInfoBarDelegate::GetButtonLabel(
ConfirmInfoBarDelegate::InfoBarButton button) const {
if (button == BUTTON_OK)
- return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING_ALLOW);
+ return l10n_util::GetStringUTF16(IDS_MULTI_DOWNLOAD_WARNING_ALLOW);
else
- return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING_DENY);
+ return l10n_util::GetStringUTF16(IDS_MULTI_DOWNLOAD_WARNING_DENY);
}
bool DownloadRequestInfoBarDelegate::Accept() {
diff --git a/chrome/browser/download/download_request_infobar_delegate.h b/chrome/browser/download/download_request_infobar_delegate.h
index c33696c..c1280cf 100644
--- a/chrome/browser/download/download_request_infobar_delegate.h
+++ b/chrome/browser/download/download_request_infobar_delegate.h
@@ -29,13 +29,13 @@ class DownloadRequestInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual void InfoBarClosed();
- virtual std::wstring GetMessageText() const;
+ virtual string16 GetMessageText() const;
virtual SkBitmap* GetIcon() const;
virtual int GetButtons() const;
- virtual std::wstring GetButtonLabel(
+ virtual string16 GetButtonLabel(
ConfirmInfoBarDelegate::InfoBarButton button) const;
virtual bool Accept();
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index d6f8907..f61ac4c 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -305,7 +305,7 @@ void OpenChromeExtension(Profile* profile,
if (contents) {
contents->AddInfoBar(
new SimpleAlertInfoBarDelegate(contents,
- l10n_util::GetString(
+ l10n_util::GetStringUTF16(
IDS_EXTENSION_INCOGNITO_INSTALL_INFOBAR_LABEL),
ResourceBundle::GetSharedInstance().GetBitmapNamed(
IDR_INFOBAR_PLUGIN_INSTALL),