| Index: views/controls/menu/menu_win.cc
|
| ===================================================================
|
| --- views/controls/menu/menu_win.cc (revision 71220)
|
| +++ views/controls/menu/menu_win.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <string>
|
|
|
| -#include "app/keyboard_codes.h"
|
| #include "app/l10n_util.h"
|
| #include "app/l10n_util_win.h"
|
| #include "app/win/window_impl.h"
|
| @@ -16,6 +15,7 @@
|
| #include "gfx/canvas_skia.h"
|
| #include "gfx/font.h"
|
| #include "gfx/rect.h"
|
| +#include "ui/base/keycodes/keyboard_codes.h"
|
| #include "views/accelerator.h"
|
|
|
| namespace views {
|
| @@ -443,7 +443,7 @@
|
| delegate()->GetLabel(item_id) : label);
|
|
|
| // Find out if there is a shortcut we need to append to the label.
|
| - views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
|
| + views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
|
| if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) {
|
| actual_label += L'\t';
|
| actual_label += accelerator.GetShortcutText();
|
|
|