diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 08:49:04 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 08:49:04 +0000 |
| commit | d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c (patch) | |
| tree | b3215901378d4ced136abc04494204095fe7714d /views/window | |
| parent | 09e14d69cad45e0a11720793ad110545592f85ae (diff) | |
| download | chromium_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 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 504a087..b92dbaa 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -4,8 +4,6 @@ #include "views/window/custom_frame_view.h" -#include <algorithm> - #include "base/utf_string_conversions.h" #include "grit/ui_resources.h" #include "grit/ui_strings.h" @@ -416,7 +414,7 @@ void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) { if (!d) return; - canvas->DrawStringInt(d->GetWindowTitle(), *title_font_, + canvas->DrawStringInt(WideToUTF16Hack(d->GetWindowTitle()), *title_font_, SK_ColorWHITE, GetMirroredXForRect(title_bounds_), title_bounds_.y(), title_bounds_.width(), title_bounds_.height()); |