diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
| commit | 76fcc3e9dc467366b9d1938834d7faff595ab873 (patch) | |
| tree | dcfc78d6c356be77a902a3fe5e59a6590fe7521e /views/window | |
| parent | 3a742fcae0c094dd1ea11354fb3dcfe9ccc07a73 (diff) | |
| download | chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.zip chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.gz chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.bz2 | |
Revert 71169 - Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/6130008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index b43b678..c2d8599 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -413,9 +413,10 @@ void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) { if (!d) return; - canvas->DrawStringInt(d->GetWindowTitle(), *title_font_, SK_ColorWHITE, - MirroredLeftPointForRect(title_bounds_), title_bounds_.y(), - title_bounds_.width(), title_bounds_.height()); + canvas->DrawStringInt(WideToUTF16Hack(d->GetWindowTitle()), *title_font_, + SK_ColorWHITE, MirroredLeftPointForRect(title_bounds_), + title_bounds_.y(), title_bounds_.width(), + title_bounds_.height()); } void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) { |