| 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/common/wm/dock/docked_window_resizer.h" | 5 #include "ash/common/wm/dock/docked_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/dock/docked_window_layout_manager.h" | 7 #include "ash/common/wm/dock/docked_window_layout_manager.h" |
| 8 #include "ash/common/wm/window_parenting_utils.h" | 8 #include "ash/common/wm/window_parenting_utils.h" |
| 9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/common/wm/wm_event.h" | 10 #include "ash/common/wm/wm_event.h" |
| 11 #include "ash/common/wm/workspace/magnetism_matcher.h" | 11 #include "ash/common/wm/workspace/magnetism_matcher.h" |
| 12 #include "ash/common/wm_window.h" | 12 #include "ash/common/wm_window.h" |
| 13 #include "ash/common/wm_window_property.h" | |
| 14 #include "ash/public/cpp/shell_window_ids.h" | 13 #include "ash/public/cpp/shell_window_ids.h" |
| 14 #include "ash/public/cpp/window_properties.h" |
| 15 #include "ash/root_window_controller.h" | 15 #include "ash/root_window_controller.h" |
| 16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
| 18 #include "ui/base/ui_base_types.h" | 18 #include "ui/base/ui_base_types.h" |
| 19 #include "ui/display/display.h" | 19 #include "ui/display/display.h" |
| 20 #include "ui/display/screen.h" | 20 #include "ui/display/screen.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 } | 198 } |
| 199 | 199 |
| 200 void DockedWindowResizer::FinishedDragging( | 200 void DockedWindowResizer::FinishedDragging( |
| 201 aura::client::WindowMoveResult move_result) { | 201 aura::client::WindowMoveResult move_result) { |
| 202 if (!did_move_or_resize_) | 202 if (!did_move_or_resize_) |
| 203 return; | 203 return; |
| 204 did_move_or_resize_ = false; | 204 did_move_or_resize_ = false; |
| 205 WmWindow* window = GetTarget(); | 205 WmWindow* window = GetTarget(); |
| 206 const bool is_attached_panel = | 206 const bool is_attached_panel = |
| 207 window->GetType() == ui::wm::WINDOW_TYPE_PANEL && | 207 window->GetType() == ui::wm::WINDOW_TYPE_PANEL && |
| 208 window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED); | 208 window->aura_window()->GetProperty(kPanelAttachedKey); |
| 209 const bool is_resized = | 209 const bool is_resized = |
| 210 (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0; | 210 (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0; |
| 211 | 211 |
| 212 // Undock the window if it is not in the normal, docked or minimized state | 212 // Undock the window if it is not in the normal, docked or minimized state |
| 213 // type. This happens if a user snaps or maximizes a window using a | 213 // type. This happens if a user snaps or maximizes a window using a |
| 214 // keyboard shortcut while it is being dragged. | 214 // keyboard shortcut while it is being dragged. |
| 215 if (!window_state_->IsMinimized() && !window_state_->IsDocked() && | 215 if (!window_state_->IsMinimized() && !window_state_->IsDocked() && |
| 216 !window_state_->IsNormalStateType()) | 216 !window_state_->IsNormalStateType()) |
| 217 is_docked_ = false; | 217 is_docked_ = false; |
| 218 | 218 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 } else if (window->GetWindowState()->IsDocked() && | 315 } else if (window->GetWindowState()->IsDocked() && |
| 316 action == DOCKED_ACTION_UNDOCK) { | 316 action == DOCKED_ACTION_UNDOCK) { |
| 317 const wm::WMEvent event(wm::WM_EVENT_NORMAL); | 317 const wm::WMEvent event(wm::WM_EVENT_NORMAL); |
| 318 window_state_->OnWMEvent(&event); | 318 window_state_->OnWMEvent(&event); |
| 319 } | 319 } |
| 320 | 320 |
| 321 return action; | 321 return action; |
| 322 } | 322 } |
| 323 | 323 |
| 324 } // namespace ash | 324 } // namespace ash |
| OLD | NEW |