| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 0ac3f7ef4b24cb610882b817529abb0652658208..30271ef64f24fac6f221fbf41eb30beeba71b31b 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -580,7 +580,7 @@ bool HandleWindowSnap(int action) {
|
| // Disable window snapping shortcut key for full screen window due to
|
| // http://crbug.com/135487.
|
| if (!window_state ||
|
| - window_state->window()->type() != aura::client::WINDOW_TYPE_NORMAL ||
|
| + window_state->window()->type() != ui::wm::WINDOW_TYPE_NORMAL ||
|
| window_state->IsFullscreen()) {
|
| return false;
|
| }
|
|
|