summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 06:39:13 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 06:39:13 +0000
commite366ff52ec3ea85a17fdc56e2dd206c7f94e6c6c (patch)
treea4d971503ed2f12250caccac03a1ed23ab83f347 /ash
parent16d8ed3775099bfd317b843007cb3e4f6f5a121b (diff)
downloadchromium_src-e366ff52ec3ea85a17fdc56e2dd206c7f94e6c6c.zip
chromium_src-e366ff52ec3ea85a17fdc56e2dd206c7f94e6c6c.tar.gz
chromium_src-e366ff52ec3ea85a17fdc56e2dd206c7f94e6c6c.tar.bz2
Bring ROTATE_WINDOWS out of debug, again.
Actually this feature is described in the "keyboard shortcut" section in GSG, so it's expected to work in production too. See crbug.com/128436 for the details. BUG=128436 Review URL: https://chromiumcodereview.appspot.com/10831208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_table.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index d04c595..4d18239 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -70,6 +70,9 @@ const AcceleratorData kAcceleratorData[] = {
{ true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
{ true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
+ { true, ui::VKEY_F3,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+ ROTATE_WINDOWS },
{ true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR },
{ true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
CYCLE_BACKWARD_LINEAR },
@@ -131,9 +134,6 @@ const AcceleratorData kAcceleratorData[] = {
const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
const AcceleratorData kDebugAcceleratorData[] = {
- { true, ui::VKEY_F3,
- ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
- ROTATE_WINDOWS },
{ true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
{ true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
TOGGLE_DESKTOP_BACKGROUND_MODE },