views/widget/root_view.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/widget/root_view.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/widget/root_view.cc

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

--- views/widget/root_view.cc (revision 58386)

+++ views/widget/root_view.cc (working copy)

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

#include <algorithm>

#include "app/drag_drop_types.h"

-#include "base/keyboard_codes.h"

+#include "app/keyboard_codes.h"

#include "base/logging.h"

#include "base/message_loop.h"

#include "gfx/canvas_skia.h"

@@ -581,8 +581,8 @@

View* v = GetFocusedView();

// Special case to handle right-click context menus triggered by the

// keyboard.

- if (v && v->IsEnabled() && ((event.GetKeyCode() == base::VKEY_APPS) ||

- (event.GetKeyCode() == base::VKEY_F10 && event.IsShiftDown()))) {

+ if (v && v->IsEnabled() && ((event.GetKeyCode() == app::VKEY_APPS) ||

+ (event.GetKeyCode() == app::VKEY_F10 && event.IsShiftDown()))) {

v->ShowContextMenu(v->GetKeyboardContextMenuLocation(), false);

return true;

}

« no previous file with comments | « views/view_unittest.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »