summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/instant_confirm_view.cc
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
commitd9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c (patch)
treeb3215901378d4ced136abc04494204095fe7714d /chrome/browser/ui/views/instant_confirm_view.cc
parent09e14d69cad45e0a11720793ad110545592f85ae (diff)
downloadchromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.zip
chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.gz
chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.bz2
Revert 103095 - Change std::wstring to string16 on WidgetDelegate::GetWindowTitle.
BUG=68267 TEST=No visible changes Review URL: http://codereview.chromium.org/7972009 TBR=yosin@chromium.org Review URL: http://codereview.chromium.org/8052030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/instant_confirm_view.cc')
-rw-r--r--chrome/browser/ui/views/instant_confirm_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc
index 673dfe9..4f5f02b 100644
--- a/chrome/browser/ui/views/instant_confirm_view.cc
+++ b/chrome/browser/ui/views/instant_confirm_view.cc
@@ -61,8 +61,8 @@ views::View* InstantConfirmView::GetContentsView() {
return this;
}
-string16 InstantConfirmView::GetWindowTitle() const {
- return l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_TITLE);
+std::wstring InstantConfirmView::GetWindowTitle() const {
+ return UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_TITLE));
}
gfx::Size InstantConfirmView::GetPreferredSize() {