summaryrefslogtreecommitdiffstats
path: root/chrome/browser/blocked_plugin_manager.h
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/blocked_plugin_manager.h
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/blocked_plugin_manager.h')
-rw-r--r--chrome/browser/blocked_plugin_manager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/blocked_plugin_manager.h b/chrome/browser/blocked_plugin_manager.h
index e9f9506..b1e231a 100644
--- a/chrome/browser/blocked_plugin_manager.h
+++ b/chrome/browser/blocked_plugin_manager.h
@@ -20,9 +20,9 @@ class BlockedPluginManager : public RenderViewHostDelegate::BlockedPlugin,
// ConfirmInfoBarDelegate methods
virtual int GetButtons() const;
- virtual std::wstring GetButtonLabel(InfoBarButton button) const;
- virtual std::wstring GetMessageText() const;
- virtual std::wstring GetLinkText();
+ virtual string16 GetButtonLabel(InfoBarButton button) const;
+ virtual string16 GetMessageText() const;
+ virtual string16 GetLinkText();
virtual SkBitmap* GetIcon() const;
virtual bool Accept();
virtual bool LinkClicked(WindowOpenDisposition disposition);