diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 14:40:35 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 14:40:35 +0000 |
| commit | dd2aef72a6f43c69a826bef7ca33b72040c3e115 (patch) | |
| tree | 5edffc99c2671a2484a30fc71a91f767a96a71a4 /ash/accelerators/accelerator_commands.cc | |
| parent | f83db67f65e79b5586f3ad1f8b1702de18f20947 (diff) | |
| download | chromium_src-dd2aef72a6f43c69a826bef7ca33b72040c3e115.zip chromium_src-dd2aef72a6f43c69a826bef7ca33b72040c3e115.tar.gz chromium_src-dd2aef72a6f43c69a826bef7ca33b72040c3e115.tar.bz2 | |
Enable minmizing fullscreen, except for flash fullscreen
shortcut for ash is reassigned to ctrl-m, and fullscreen flash always consumes ctrl-m and never send it back to us as unhandled, so this is no longer necessary.
BUG=131709, 286515
Review URL: https://codereview.chromium.org/35983002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_commands.cc')
| -rw-r--r-- | ash/accelerators/accelerator_commands.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc index 1cb326d..73f1b1a 100644 --- a/ash/accelerators/accelerator_commands.cc +++ b/ash/accelerators/accelerator_commands.cc @@ -23,10 +23,7 @@ bool ToggleMinimized() { return true; } wm::WindowState* window_state = wm::GetWindowState(window); - // Disable the shortcut for minimizing full screen window due to - // crbug.com/131709, which is a crashing issue related to minimizing - // full screen pepper window. - if (window_state->IsFullscreen() || !window_state->CanMinimize()) + if (!window_state->CanMinimize()) return false; ash::Shell::GetInstance()->delegate()->RecordUserMetricsAction( ash::UMA_MINIMIZE_PER_KEY); |