Index: ash/wm/maximize_mode/maximize_mode_controller.cc |
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc |
index 7fec42064d7b923798fb3c180d1ccd67484ed159..47ae3c80bdd40630ec69c8fa088dadcb0bb9e520 100644 |
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc |
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc |
@@ -7,6 +7,7 @@ |
#include "ash/accelerometer/accelerometer_controller.h" |
#include "ash/display/display_manager.h" |
#include "ash/shell.h" |
+#include "ash/wm/maximize_mode/maximize_mode_event_blocker.h" |
#include "ui/gfx/vector3d_f.h" |
namespace ash { |
@@ -113,9 +114,11 @@ void MaximizeModeController::HandleHingeRotation(const gfx::Vector3dF& base, |
angle > kFullyOpenAngleErrorTolerance && |
angle < kExitMaximizeModeAngle) { |
Shell::GetInstance()->EnableMaximizeModeWindowManager(false); |
+ event_blocker_.reset(); |
} else if (!maximize_mode_engaged && |
angle > kEnterMaximizeModeAngle) { |
Shell::GetInstance()->EnableMaximizeModeWindowManager(true); |
+ event_blocker_.reset(new MaximizeModeEventBlocker); |
} |
} |