| Index: ui/views/controls/menu/menu_controller.cc
|
| diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
|
| index 12922a71861c99b61bd17c0031558ea83f290e74..38d35e4cbace4ac1352dc2123372b4c8ca174398 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -87,13 +87,13 @@ const int kBubbleTipSizeTopBottom = 11;
|
| const float kMaximumLengthMovedToActivate = 4.0f;
|
|
|
| // Returns true if the mnemonic of |menu| matches key.
|
| -bool MatchesMnemonic(MenuItemView* menu, char16 key) {
|
| +bool MatchesMnemonic(MenuItemView* menu, base::char16 key) {
|
| return menu->GetMnemonic() == key;
|
| }
|
|
|
| // Returns true if |menu| doesn't have a mnemonic and first character of the its
|
| // title is |key|.
|
| -bool TitleMatchesMnemonic(MenuItemView* menu, char16 key) {
|
| +bool TitleMatchesMnemonic(MenuItemView* menu, base::char16 key) {
|
| if (menu->GetMnemonic())
|
| return false;
|
|
|
| @@ -1038,7 +1038,7 @@ bool MenuController::Dispatch(const MSG& msg) {
|
| return result;
|
| }
|
| case WM_CHAR:
|
| - return !SelectByChar(static_cast<char16>(msg.wParam));
|
| + return !SelectByChar(static_cast<base::char16>(msg.wParam));
|
| case WM_KEYUP:
|
| return true;
|
|
|
| @@ -2046,8 +2046,8 @@ void MenuController::CloseSubmenu() {
|
|
|
| MenuController::SelectByCharDetails MenuController::FindChildForMnemonic(
|
| MenuItemView* parent,
|
| - char16 key,
|
| - bool (*match_function)(MenuItemView* menu, char16 mnemonic)) {
|
| + base::char16 key,
|
| + bool (*match_function)(MenuItemView* menu, base::char16 mnemonic)) {
|
| SubmenuView* submenu = parent->GetSubmenu();
|
| DCHECK(submenu);
|
| SelectByCharDetails details;
|
| @@ -2098,9 +2098,9 @@ bool MenuController::AcceptOrSelect(MenuItemView* parent,
|
| return false;
|
| }
|
|
|
| -bool MenuController::SelectByChar(char16 character) {
|
| - char16 char_array[] = { character, 0 };
|
| - char16 key = base::i18n::ToLower(char_array)[0];
|
| +bool MenuController::SelectByChar(base::char16 character) {
|
| + base::char16 char_array[] = { character, 0 };
|
| + base::char16 key = base::i18n::ToLower(char_array)[0];
|
| MenuItemView* item = pending_state_.item;
|
| if (!item->HasSubmenu() || !item->GetSubmenu()->IsShowing())
|
| item = item->GetParentMenuItem();
|
|
|