summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_table.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-01 14:29:40 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-01 14:29:40 +0000
commit76dfd849955d1e44c0040fb36336ded42b3d322c (patch)
tree5ac87c1433143ef0078d62ec53454470520bdfc8 /ash/accelerators/accelerator_table.cc
parent28bdbe8beba71523e60d8ea62cec4d4074861f68 (diff)
downloadchromium_src-76dfd849955d1e44c0040fb36336ded42b3d322c.zip
chromium_src-76dfd849955d1e44c0040fb36336ded42b3d322c.tar.gz
chromium_src-76dfd849955d1e44c0040fb36336ded42b3d322c.tar.bz2
Cleanup
* Rename set_always_restores_to_restore_bounds to unminimize_to_restore_bounds because that's what it really is for. * add desktop shortcut to toggle fullscreen BUG=318325 Review URL: https://codereview.chromium.org/146963003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
-rw-r--r--ash/accelerators/accelerator_table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 4baff1f..a3303f6 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -213,6 +213,8 @@ const AcceleratorData kDesktopAcceleratorData[] = {
CYCLE_BACKWARD_MRU },
{ true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
TOGGLE_DESKTOP_BACKGROUND_MODE },
+ { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ TOGGLE_FULLSCREEN },
};
const size_t kDesktopAcceleratorDataLength = arraysize(kDesktopAcceleratorData);