views/controls/menu/native_menu_win.cc - Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/menu/native_menu_win.cc

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: views/controls/menu/native_menu_win.cc

===================================================================

--- views/controls/menu/native_menu_win.cc (revision 58386)

+++ views/controls/menu/native_menu_win.cc (working copy)

@@ -4,9 +4,9 @@

#include "views/controls/menu/native_menu_win.h"

+#include "app/keyboard_codes.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 "gfx/canvas_skia.h"

@@ -554,7 +554,7 @@

menus::MenuModel::ItemType type = model_->GetTypeAt(model_index);

if (type != menus::MenuModel::TYPE_SUBMENU) {

// Add accelerator details to the label if provided.

- views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false);

+ views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);

if (model_->GetAcceleratorAt(model_index, &accelerator)) {

formatted += L"\t";

formatted += accelerator.GetShortcutText();

« no previous file with comments | « views/controls/menu/native_menu_gtk.cc ('k') | views/controls/native_control.h » ('j') | no next file with comments »