Index: ash/accelerators/accelerator_controller.cc |
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
index 68f2b2fe92d83ef7465af6eee91dfa651efce3a0..20cc26418712824e5554ab0be15884892db8a14c 100644 |
--- a/ash/accelerators/accelerator_controller.cc |
+++ b/ash/accelerators/accelerator_controller.cc |
@@ -524,7 +524,8 @@ bool AcceleratorController::PerformAction(int action, |
case WINDOW_SNAP_LEFT: |
case WINDOW_SNAP_RIGHT: { |
aura::Window* window = wm::GetActiveWindow(); |
- if (!window) |
+ // Disable window docking shortcut key due to http://crbug.com/135487. |
+ if (!window || wm::IsWindowFullscreen(window)) |
break; |
internal::SnapSizer sizer(window, |
gfx::Point(), |