ash/accelerators/accelerator_table.cc - Issue 10221028: Move DIP translation from ui/aura to ui/compositor

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: ash/accelerators/accelerator_table.cc

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: disable tests that doesn't run on bots Created 8 years, 7 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:

Index: ash/accelerators/accelerator_table.cc

diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc

index 0b7093a8b665289c8381fbbb660124093e72b71d..08d47f228445d0afe3854ef2c90c445f417fb8e2 100644

--- a/ash/accelerators/accelerator_table.cc

+++ b/ash/accelerators/accelerator_table.cc

@@ -104,8 +104,9 @@ const AcceleratorData kAcceleratorData[] = {

// For testing on systems where Alt-Tab is already mapped.

{ true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU },

{ true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU },

- { true, ui::VKEY_F4, false, true, false, ADD_REMOVE_MONITOR },

- { true, ui::VKEY_F4, true, true, false, CYCLE_MONITOR },

+ { true, ui::VKEY_F4, false, true, false, MONITOR_ADD_REMOVE },

+ { true, ui::VKEY_F4, true, true, false, MONITOR_CYCLE },

+ { true, ui::VKEY_HOME, true, true, false, MONITOR_TOGGLE_SCALE },

#endif

// trigger_on_press, KeyboardCode, shift, control, alt, AcceleratorAction

};

« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »