diff options
Diffstat (limited to 'views/controls/menu')
-rw-r--r-- | views/controls/menu/menu_win.cc | 3 | ||||
-rw-r--r-- | views/controls/menu/native_menu_gtk.cc | 3 | ||||
-rw-r--r-- | views/controls/menu/native_menu_win.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index 68cc8ff..852304f 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -11,6 +11,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/gfx/rect.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" @@ -441,7 +442,7 @@ void MenuWin::AddMenuItemInternal(int index, delegate()->GetLabel(item_id) : label); // Find out if there is a shortcut we need to append to the label. - views::Accelerator accelerator(0, false, false, false); + views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false); if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) { actual_label += L'\t'; actual_label += accelerator.GetShortcutText(); diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 55e10ae..7bcb7b9 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -7,6 +7,7 @@ #include <string> #include "base/gfx/gtk_util.h" +#include "base/keyboard_codes.h" #include "base/string_util.h" #include "base/time.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -162,7 +163,7 @@ void NativeMenuGtk::AddMenuItemAt(int index, submenu->GetNativeMenu()); } - views::Accelerator accelerator(0, false, false, false); + views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false); if (model_->GetAcceleratorAt(index, &accelerator)) { // TODO(beng): accelerators w/gtk_widget_add_accelerator. } diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index f078d71..0af8a9af 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -8,6 +8,7 @@ #include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -458,7 +459,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString( Menu2Model::ItemType type = model_->GetTypeAt(model_index); if (type != Menu2Model::TYPE_SUBMENU) { // Add accelerator details to the label if provided. - views::Accelerator accelerator(0, false, false, false); + views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false); if (model_->GetAcceleratorAt(model_index, &accelerator)) { formatted += L"\t"; formatted += accelerator.GetShortcutText(); |