Screen Magnifier: Change keyboard shortcut from [CTRL + brightness] to [CTRL + ALT + brightness]

Screen Magnifier: Change keyboard shortcut from [CTRL + brightness] to [CTRL + ALT + brightness]

BUG=153961
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=160776

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=163797

[yoshiki, 2012-10-05 07:19:28]

derat: could you take a look?

[Daniel Erat, 2012-10-05 14:16:50]

lgtm

[commit-bot: I haz the power, 2012-10-09 00:20:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/11035051/2001

[commit-bot: I haz the power, 2012-10-09 01:06:02]

Retried try job too often for step(s) interactive_ui_tests

[commit-bot: I haz the power, 2012-10-09 01:42:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/11035051/2001

[commit-bot: I haz the power, 2012-10-09 02:45:43]

Change committed as 160776

[commit-bot: I haz the power, 2012-10-24 05:59:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/11035051/2001

[commit-bot: I haz the power, 2012-10-24 05:59:08]

Failed to apply patch for ash/accelerators/accelerator_table.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/accelerators/accelerator_table.cc
  Hunk #1 FAILED at 116.
  1 out of 1 hunk FAILED -- saving rejects to file
ash/accelerators/accelerator_table.cc.rej

Patch:       ash/accelerators/accelerator_table.cc
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc
b/ash/accelerators/accelerator_table.cc
index
ac40ab08222a91cf1de9f2ae37f416c4962ae39b..8abc308f96b591b1c6ba85f6bab04f06415bc610
100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -116,8 +116,10 @@ const AcceleratorData kAcceleratorData[] = {
   { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
   { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
   { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY },
-  { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
-  { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT},
+  { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+    MAGNIFY_SCREEN_ZOOM_IN},
+  { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+    MAGNIFY_SCREEN_ZOOM_OUT},
   { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
   { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     SHOW_KEYBOARD_OVERLAY },

[yoshiki, 2012-10-24 05:59:12]

Committing this patch again.

[commit-bot: I haz the power, 2012-10-24 06:52:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/11035051/20001

[commit-bot: I haz the power, 2012-10-24 09:06:54]

Change committed as 163797