| Index: views/controls/menu/native_menu_win.cc
|
| diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
|
| index 99094aede7c2acc0f6a8ac80c925ef092ca5e2b2..1b6e738ce0e1ebd022e2345fdd56c45b1d09fccf 100644
|
| --- a/views/controls/menu/native_menu_win.cc
|
| +++ b/views/controls/menu/native_menu_win.cc
|
| @@ -16,12 +16,12 @@
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/l10n/l10n_util_win.h"
|
| +#include "ui/base/models/accelerator.h"
|
| #include "ui/base/win/hwnd_util.h"
|
| #include "ui/gfx/canvas_skia.h"
|
| #include "ui/gfx/font.h"
|
| #include "ui/gfx/native_theme.h"
|
| #include "ui/gfx/rect.h"
|
| -#include "views/accelerator.h"
|
| #include "views/controls/menu/menu_2.h"
|
| #include "views/controls/menu/menu_config.h"
|
| #include "views/controls/menu/menu_listener.h"
|
| @@ -684,7 +684,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString(MENUITEMINFO* mii,
|
| ReplaceSubstringsAfterOffset(&formatted, 0, L"\t", L" ");
|
| if (type != ui::MenuModel::TYPE_SUBMENU) {
|
| // Add accelerator details to the label if provided.
|
| - views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
|
| + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
|
| if (model_->GetAcceleratorAt(model_index, &accelerator)) {
|
| formatted += L"\t";
|
| formatted += accelerator.GetShortcutText();
|
|
|