diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:47:20 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:47:20 +0000 |
| commit | e5a8c47bda7fe8e3d8491fdd74cd166da02b8a7b (patch) | |
| tree | 35f5b482eb88291018ecc7a9236d6a9067329fe5 /views | |
| parent | 13ecb04b3a06a7e84c95a6b7c99f64529aa03b61 (diff) | |
| download | chromium_src-e5a8c47bda7fe8e3d8491fdd74cd166da02b8a7b.zip chromium_src-e5a8c47bda7fe8e3d8491fdd74cd166da02b8a7b.tar.gz chromium_src-e5a8c47bda7fe8e3d8491fdd74cd166da02b8a7b.tar.bz2 | |
Remove a deprecated wstring ToLower function.
BUG=23581
Review URL: http://codereview.chromium.org/3044043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 6 | ||||
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 21a7708..3d49366 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -9,6 +9,7 @@ #include "base/i18n/rtl.h" #include "base/keyboard_codes.h" #include "base/time.h" +#include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_scroll_view_container.h" @@ -1537,7 +1538,7 @@ void MenuController::CloseSubmenu() { bool MenuController::SelectByChar(wchar_t character) { wchar_t char_array[1] = { character }; - wchar_t key = l10n_util::ToLower(char_array)[0]; + wchar_t key = UTF16ToWide(l10n_util::ToLower(WideToUTF16(char_array)))[0]; MenuItemView* item = pending_state_.item; if (!item->HasSubmenu() || !item->GetSubmenu()->IsShowing()) item = item->GetParentMenuItem(); @@ -1570,7 +1571,8 @@ bool MenuController::SelectByChar(wchar_t character) { for (int i = 0; i < menu_item_count; ++i) { MenuItemView* child = submenu->GetMenuItemAt(i); if (!child->GetMnemonic() && child->IsEnabled()) { - std::wstring lower_title = l10n_util::ToLower(child->GetTitle()); + std::wstring lower_title = UTF16ToWide( + l10n_util::ToLower(WideToUTF16(child->GetTitle()))); if (child == pending_state_.item) index_of_item = i; if (lower_title.length() && lower_title[0] == key) { diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index b88fc5b..e0ca73d 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -5,6 +5,7 @@ #include "views/controls/menu/menu_item_view.h" #include "app/l10n_util.h" +#include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "grit/app_strings.h" #include "views/controls/button/text_button.h" @@ -316,7 +317,7 @@ wchar_t MenuItemView::GetMnemonic() { if (index != std::wstring::npos) { if (index + 1 != title.size() && title[index + 1] != '&') { wchar_t char_array[1] = { title[index + 1] }; - return l10n_util::ToLower(char_array)[0]; + return UTF16ToWide(l10n_util::ToLower(WideToUTF16(char_array)))[0]; } index++; } |