summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2015-10-15 16:35:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-15 23:36:57 +0000
commit2319c18ac2f34856fdffc532201d533bba137870 (patch)
tree21024fe834b104a84fe3d6af92c6b12cf1aa3500 /ash
parent26c9704d15300deb88144bab28e5bea5b2b8b7b2 (diff)
downloadchromium_src-2319c18ac2f34856fdffc532201d533bba137870.zip
chromium_src-2319c18ac2f34856fdffc532201d533bba137870.tar.gz
chromium_src-2319c18ac2f34856fdffc532201d533bba137870.tar.bz2
Change the debug accelerator to switch device scale factor.
Linux's IME can steal this. BUG=None TBR=afakhry@chromium.org, Review URL: https://codereview.chromium.org/1407013003 Cr-Commit-Position: refs/heads/master@{#354399}
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 6f6d4b5..35888ed 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -264,7 +264,7 @@ const AcceleratorData kDebugAcceleratorData[] = {
{true, ui::VKEY_W,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
DEBUG_PRINT_WINDOW_HIERARCHY},
- {true, ui::VKEY_S,
+ {true, ui::VKEY_D,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
DEBUG_TOGGLE_DEVICE_SCALE_FACTOR},
{true, ui::VKEY_B,