summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 15:45:11 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 15:45:11 +0000
commit2b505d67fc63b1a936b3a982180bf68646a6c8a2 (patch)
treee812b33417e4c72a77437fcb410f67fafaec7ba1 /views/controls
parent7fca53d420d201e1ec5a637ad236056c61e4e4b1 (diff)
downloadchromium_src-2b505d67fc63b1a936b3a982180bf68646a6c8a2.zip
chromium_src-2b505d67fc63b1a936b3a982180bf68646a6c8a2.tar.gz
chromium_src-2b505d67fc63b1a936b3a982180bf68646a6c8a2.tar.bz2
views: Fix views examples tab titles to not look garbage on Windows.
BUG=98545 TEST=run views_examples, the tab titles shouldn't look garbage. R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: http://codereview.chromium.org/8080001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_win.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index b15b8d3..455e8fb 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/stl_util.h"
-#include "base/utf_string_conversions.h"
#include "ui/base/l10n/l10n_util_win.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/win/hwnd_util.h"
@@ -175,7 +174,7 @@ void NativeTabbedPaneWin::AddNativeTab(int index, const string16& title) {
tcitem.mask |= TCIF_RTLREADING;
}
- tcitem.pszText = const_cast<wchar_t*>(UTF16ToWide(title).c_str());
+ tcitem.pszText = const_cast<wchar_t*>(title.c_str());
int result = TabCtrl_InsertItem(native_view(), index, &tcitem);
DCHECK(result != -1);
}