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/printing | |
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/printing')
-rw-r--r-- | chrome/browser/printing/print_dialog_gtk.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc index 5cc203d..7bf9a39 100644 --- a/chrome/browser/printing/print_dialog_gtk.cc +++ b/chrome/browser/printing/print_dialog_gtk.cc @@ -12,6 +12,7 @@ #include "base/lazy_instance.h" #include "base/lock.h" #include "base/logging.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chrome_thread.h" @@ -39,15 +40,15 @@ class PdfUnsupportedInfoBarDelegate : public LinkInfoBarDelegate { virtual ~PdfUnsupportedInfoBarDelegate() {} - virtual std::wstring GetMessageTextWithOffset(size_t* link_offset) const { - std::wstring message(L"Oops! Your printer does not support PDF. Please " - L"report this to us ."); + virtual string16 GetMessageTextWithOffset(size_t* link_offset) const { + string16 message = UTF8ToUTF16("Oops! Your printer does not support PDF. " + "Please report this to us."); *link_offset = message.length() - 1; return message; } - virtual std::wstring GetLinkText() const { - return std::wstring(L"here"); + virtual string16 GetLinkText() const { + return UTF8ToUTF16("here"); } virtual Type GetInfoBarType() { |