summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_installer.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 19:39:58 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 19:39:58 +0000
commite23d3a394aed0b7f353edfeaac2fc2181085c8ff (patch)
treee5ae26a74ec8fa098aab0e9837ad8d4434ab6b08 /chrome/browser/plugin_installer.cc
parent997e70b24b8041d402f759587b8ce01c56f55c0b (diff)
downloadchromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.zip
chromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.tar.gz
chromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.tar.bz2
Convert infobar APIs to UTF-16.
The critical change is the base class in infobar_delegate.h. The remainder is just adapting all users to that change. I grepped for all instances of the three base functions whose types I changed to be more sure that I found all classes that tried to overload these functions. I sure wish C++ had an @Override annotation. :~( TEST=compiles BUG=23581 Review URL: http://codereview.chromium.org/3127009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_installer.cc')
-rw-r--r--chrome/browser/plugin_installer.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index 2d0e0a3..1b1d0c5 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -43,8 +43,8 @@ void PluginInstaller::OnMissingPluginStatus(int status) {
}
}
-std::wstring PluginInstaller::GetMessageText() const {
- return l10n_util::GetString(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
+string16 PluginInstaller::GetMessageText() const {
+ return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
}
SkBitmap* PluginInstaller::GetIcon() const {
@@ -56,9 +56,9 @@ int PluginInstaller::GetButtons() const {
return BUTTON_OK;
}
-std::wstring PluginInstaller::GetButtonLabel(InfoBarButton button) const {
+string16 PluginInstaller::GetButtonLabel(InfoBarButton button) const {
if (button == BUTTON_OK)
- return l10n_util::GetString(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
+ return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
return ConfirmInfoBarDelegate::GetButtonLabel(button);
}
@@ -67,8 +67,8 @@ bool PluginInstaller::Accept() {
return true;
}
-std::wstring PluginInstaller::GetLinkText() {
- return l10n_util::GetString(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
+string16 PluginInstaller::GetLinkText() {
+ return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
}
bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) {