| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 5a6dba781a213a8716945bd23ea31ceb75b55dd3..6eb68a3921409ddb09a7388551f83661ff71e866 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -464,9 +464,7 @@ bool CanHandleWindowSnapOrDock() {
|
| wm::WindowState* window_state = wm::GetActiveWindowState();
|
| // Disable window snapping shortcut key for full screen window due to
|
| // http://crbug.com/135487.
|
| - return (window_state &&
|
| - (window_state->window()->type() == ui::wm::WINDOW_TYPE_NORMAL ||
|
| - window_state->window()->type() == ui::wm::WINDOW_TYPE_PANEL) &&
|
| + return (window_state && window_state->IsUserPositionable() &&
|
| !window_state->IsFullscreen());
|
| }
|
|
|
|
|