| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index bc742c74cb6f419442a9cbb330a5129f90865cf4..03976d288f357a71f68415c62ffe1db659ccf56e 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -713,19 +713,7 @@ bool AcceleratorController::PerformAction(int action,
|
| shell->delegate()->RecordUserMetricsAction(
|
| UMA_ACCEL_MAXIMIZE_RESTORE_F4);
|
| }
|
| - aura::Window* window = wm::GetActiveWindow();
|
| - if (!window)
|
| - return true;
|
| - if (wm::IsWindowFullscreen(window)) {
|
| - // Chrome also uses VKEY_F4 as a shortcut. Its action is to toggle
|
| - // fullscreen. We return false below so Chrome will process the
|
| - // shortcut again and, in case of VKEY_F4, exit fullscreen.
|
| - return false;
|
| - }
|
| - if (wm::IsWindowMaximized(window))
|
| - wm::RestoreWindow(window);
|
| - else if (wm::CanMaximizeWindow(window))
|
| - wm::MaximizeWindow(window);
|
| + shell->delegate()->ToggleMaximized();
|
| return true;
|
| }
|
| case TOGGLE_MAXIMIZED_RELEASED: {
|
|
|