diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 20:57:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 20:57:00 +0000 |
| commit | 6f1d18ebd4dd4315b02197c4593ad905a9049f8b (patch) | |
| tree | a40d89ce75943348284fd36617a674d5d765331a /views/accelerator.cc | |
| parent | d00120bddc50d4a4499623b8727119c48122ad7f (diff) | |
| download | chromium_src-6f1d18ebd4dd4315b02197c4593ad905a9049f8b.zip chromium_src-6f1d18ebd4dd4315b02197c4593ad905a9049f8b.tar.gz chromium_src-6f1d18ebd4dd4315b02197c4593ad905a9049f8b.tar.bz2 | |
Remove wstring from views. Part 2: Switch accelerator strings to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6199005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.cc')
| -rw-r--r-- | views/accelerator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/accelerator.cc b/views/accelerator.cc index 9cf6884..de1e131 100644 --- a/views/accelerator.cc +++ b/views/accelerator.cc @@ -19,7 +19,7 @@ namespace views { -std::wstring Accelerator::GetShortcutText() const { +string16 Accelerator::GetShortcutText() const { int string_id = 0; switch(key_code_) { case app::VKEY_TAB: @@ -157,7 +157,7 @@ std::wstring Accelerator::GetShortcutText() const { shortcut.swap(shortcut_rtl); } - return UTF16ToWide(shortcut); + return shortcut; } } // namespace views |