diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 19:39:58 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 19:39:58 +0000 |
| commit | e23d3a394aed0b7f353edfeaac2fc2181085c8ff (patch) | |
| tree | e5ae26a74ec8fa098aab0e9837ad8d4434ab6b08 /chrome/browser/blocked_plugin_manager.cc | |
| parent | 997e70b24b8041d402f759587b8ce01c56f55c0b (diff) | |
| download | chromium_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/blocked_plugin_manager.cc')
| -rw-r--r-- | chrome/browser/blocked_plugin_manager.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/blocked_plugin_manager.cc b/chrome/browser/blocked_plugin_manager.cc index 92b7c91..222ceee 100644 --- a/chrome/browser/blocked_plugin_manager.cc +++ b/chrome/browser/blocked_plugin_manager.cc @@ -29,19 +29,18 @@ int BlockedPluginManager::GetButtons() const { return BUTTON_OK; } -std::wstring BlockedPluginManager::GetButtonLabel(InfoBarButton button) const { +string16 BlockedPluginManager::GetButtonLabel(InfoBarButton button) const { if (button == BUTTON_OK) - return l10n_util::GetString(IDS_PLUGIN_LOAD_SHORT); + return l10n_util::GetStringUTF16(IDS_PLUGIN_LOAD_SHORT); return ConfirmInfoBarDelegate::GetButtonLabel(button); } -std::wstring BlockedPluginManager::GetMessageText() const { - return UTF16ToWide(l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_PROMPT, - name_)); +string16 BlockedPluginManager::GetMessageText() const { + return l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_PROMPT, name_); } -std::wstring BlockedPluginManager::GetLinkText() { - return l10n_util::GetString(IDS_LEARN_MORE); +string16 BlockedPluginManager::GetLinkText() { + return l10n_util::GetStringUTF16(IDS_LEARN_MORE); } SkBitmap* BlockedPluginManager::GetIcon() const { |