summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_table.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-22 21:13:31 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-22 21:13:31 +0000
commit8b2447ecbe6d9816975fd2978a439332cd3a78cb (patch)
tree81e901ec326c1fcecd6c38636848d5bf102972d1 /ash/accelerators/accelerator_table.cc
parent7c6942232d73e06fa7e6cc94bc9e4017710ffe79 (diff)
downloadchromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.zip
chromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.tar.gz
chromium_src-8b2447ecbe6d9816975fd2978a439332cd3a78cb.tar.bz2
- Store rotation/ui scale to local state.
- Reset the overscan to the default value if the display has overscan. - Move overscan data into kDisplayProperties dictionary value. - Remove Rotate/Scale shortcut from login screen as we can't store the state in login screen. BUG=196818 TEST=covered by unit test. Review URL: https://codereview.chromium.org/12505005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
-rw-r--r--ash/accelerators/accelerator_table.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 75e858d..a8b21ca 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -241,10 +241,7 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
VOLUME_DOWN,
VOLUME_MUTE,
VOLUME_UP,
- ROTATE_SCREEN,
ROTATE_WINDOW,
- SCALE_UI_UP,
- SCALE_UI_DOWN,
#if !defined(NDEBUG)
PRINT_LAYER_HIERARCHY,
PRINT_VIEW_HIERARCHY,