Index: ash/accelerators/accelerator_commands.cc |
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc |
index 24b8a62b13e84fee0045b0a6860b80facde2ff8f..c3271b409b4a1341e58a423785755a3126d68b0a 100644 |
--- a/ash/accelerators/accelerator_commands.cc |
+++ b/ash/accelerators/accelerator_commands.cc |
@@ -7,6 +7,7 @@ |
#include "ash/shell.h" |
#include "ash/shell_delegate.h" |
#include "ash/wm/window_cycle_controller.h" |
+#include "ash/wm/window_state.h" |
#include "ash/wm/window_util.h" |
namespace ash { |
@@ -21,14 +22,15 @@ bool ToggleMinimized() { |
HandleCycleWindow(WindowCycleController::FORWARD, false); |
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 (wm::IsWindowFullscreen(window) || !wm::CanMinimizeWindow(window)) |
+ if (window_state->IsFullscreen() || !window_state->CanMinimize()) |
return false; |
ash::Shell::GetInstance()->delegate()->RecordUserMetricsAction( |
ash::UMA_MINIMIZE_PER_KEY); |
- wm::MinimizeWindow(window); |
+ window_state->Minimize(); |
return true; |
} |