| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/mus/move_event_handler.h" | 5 #include "ash/mus/move_event_handler.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/common/wm_window.h" |
| 8 #include "ash/mus/bridge/workspace_event_handler_mus.h" | 8 #include "ash/mus/bridge/workspace_event_handler_mus.h" |
| 9 #include "services/ui/public/interfaces/cursor.mojom.h" | 9 #include "services/ui/public/interfaces/cursor.mojom.h" |
| 10 #include "ui/aura/mus/window_manager_delegate.h" | 10 #include "ui/aura/mus/window_manager_delegate.h" |
| 11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_property.h" | 12 #include "ui/aura/window_property.h" |
| 13 #include "ui/base/hit_test.h" | 13 #include "ui/base/hit_test.h" |
| 14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
| 15 | 15 |
| 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::MoveEventHandler*); | 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::MoveEventHandler*); |
| 17 | 17 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 wm::WmToplevelWindowEventHandler::DragResult result) { | 55 wm::WmToplevelWindowEventHandler::DragResult result) { |
| 56 end_closure.Run(result == | 56 end_closure.Run(result == |
| 57 wm::WmToplevelWindowEventHandler::DragResult::SUCCESS); | 57 wm::WmToplevelWindowEventHandler::DragResult::SUCCESS); |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace | 60 } // namespace |
| 61 | 61 |
| 62 MoveEventHandler::MoveEventHandler( | 62 MoveEventHandler::MoveEventHandler( |
| 63 aura::WindowManagerClient* window_manager_client, | 63 aura::WindowManagerClient* window_manager_client, |
| 64 aura::Window* window) | 64 aura::Window* window) |
| 65 : wm_window_(ash::WmWindowAura::Get(window)), | 65 : wm_window_(WmWindow::Get(window)), |
| 66 window_manager_client_(window_manager_client), | 66 window_manager_client_(window_manager_client), |
| 67 toplevel_window_event_handler_(wm_window_->GetShell()) { | 67 toplevel_window_event_handler_(wm_window_->GetShell()) { |
| 68 window->AddObserver(this); | 68 window->AddObserver(this); |
| 69 window->AddPreTargetHandler(this); | 69 window->AddPreTargetHandler(this); |
| 70 | 70 |
| 71 window->SetProperty(kWmMoveEventHandler, this); | 71 window->SetProperty(kWmMoveEventHandler, this); |
| 72 } | 72 } |
| 73 | 73 |
| 74 MoveEventHandler::~MoveEventHandler() { | 74 MoveEventHandler::~MoveEventHandler() { |
| 75 Detach(); | 75 Detach(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 // static | 78 // static |
| 79 MoveEventHandler* MoveEventHandler::GetForWindow(WmWindow* wm_window) { | 79 MoveEventHandler* MoveEventHandler::GetForWindow(WmWindow* wm_window) { |
| 80 return ash::WmWindowAura::GetAuraWindow(wm_window)->GetProperty( | 80 return WmWindow::GetAuraWindow(wm_window)->GetProperty(kWmMoveEventHandler); |
| 81 kWmMoveEventHandler); | |
| 82 } | 81 } |
| 83 | 82 |
| 84 void MoveEventHandler::AttemptToStartDrag( | 83 void MoveEventHandler::AttemptToStartDrag( |
| 85 const gfx::Point& point_in_parent, | 84 const gfx::Point& point_in_parent, |
| 86 int window_component, | 85 int window_component, |
| 87 aura::client::WindowMoveSource source, | 86 aura::client::WindowMoveSource source, |
| 88 const base::Callback<void(bool success)>& end_closure) { | 87 const base::Callback<void(bool success)>& end_closure) { |
| 89 toplevel_window_event_handler_.AttemptToStartDrag( | 88 toplevel_window_event_handler_.AttemptToStartDrag( |
| 90 wm_window_, point_in_parent, window_component, source, | 89 wm_window_, point_in_parent, window_component, source, |
| 91 base::Bind(&OnMoveLoopCompleted, end_closure)); | 90 base::Bind(&OnMoveLoopCompleted, end_closure)); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 toplevel_window_event_handler_.RevertDrag(); | 145 toplevel_window_event_handler_.RevertDrag(); |
| 147 } | 146 } |
| 148 | 147 |
| 149 void MoveEventHandler::OnWindowDestroying(aura::Window* window) { | 148 void MoveEventHandler::OnWindowDestroying(aura::Window* window) { |
| 150 DCHECK_EQ(wm_window_->aura_window(), window); | 149 DCHECK_EQ(wm_window_->aura_window(), window); |
| 151 Detach(); | 150 Detach(); |
| 152 } | 151 } |
| 153 | 152 |
| 154 } // namespace mus | 153 } // namespace mus |
| 155 } // namespace ash | 154 } // namespace ash |
| OLD | NEW |