| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/dock/docked_window_resizer.h" | 5 #include "ash/wm/dock/docked_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/shell_window_ids.h" | 7 #include "ash/shell_window_ids.h" |
| 8 #include "ash/wm/aura/wm_window_aura.h" | |
| 9 #include "ash/wm/common/dock/docked_window_layout_manager.h" | 8 #include "ash/wm/common/dock/docked_window_layout_manager.h" |
| 10 #include "ash/wm/common/window_parenting_utils.h" | 9 #include "ash/wm/common/window_parenting_utils.h" |
| 11 #include "ash/wm/common/window_state.h" | 10 #include "ash/wm/common/window_state.h" |
| 12 #include "ash/wm/common/wm_event.h" | 11 #include "ash/wm/common/wm_event.h" |
| 13 #include "ash/wm/common/wm_root_window_controller.h" | 12 #include "ash/wm/common/wm_root_window_controller.h" |
| 14 #include "ash/wm/common/wm_window.h" | 13 #include "ash/wm/common/wm_window.h" |
| 15 #include "ash/wm/workspace/magnetism_matcher.h" | 14 #include "ash/wm/workspace/magnetism_matcher.h" |
| 16 #include "ui/base/hit_test.h" | 15 #include "ui/base/hit_test.h" |
| 17 #include "ui/base/ui_base_types.h" | 16 #include "ui/base/ui_base_types.h" |
| 18 #include "ui/gfx/screen.h" | 17 #include "ui/gfx/screen.h" |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 } else if (window->GetWindowState()->IsDocked() && | 310 } else if (window->GetWindowState()->IsDocked() && |
| 312 action == DOCKED_ACTION_UNDOCK) { | 311 action == DOCKED_ACTION_UNDOCK) { |
| 313 const wm::WMEvent event(wm::WM_EVENT_NORMAL); | 312 const wm::WMEvent event(wm::WM_EVENT_NORMAL); |
| 314 window_state_->OnWMEvent(&event); | 313 window_state_->OnWMEvent(&event); |
| 315 } | 314 } |
| 316 | 315 |
| 317 return action; | 316 return action; |
| 318 } | 317 } |
| 319 | 318 |
| 320 } // namespace ash | 319 } // namespace ash |
| OLD | NEW |