Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: ash/mus/move_event_handler.cc

Issue 2625873007: Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus (Closed)
Patch Set: merge Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/move_event_handler.h ('k') | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/mus/bridge/wm_window_mus.h" 7 #include "ash/aura/wm_window_aura.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
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_(WmWindowMus::Get(window)), 65 : wm_window_(ash::WmWindowAura::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 WmWindowMus::GetAuraWindow(wm_window)->GetProperty( 80 return ash::WmWindowAura::GetAuraWindow(wm_window)->GetProperty(
81 kWmMoveEventHandler); 81 kWmMoveEventHandler);
82 } 82 }
83 83
84 void MoveEventHandler::AttemptToStartDrag( 84 void MoveEventHandler::AttemptToStartDrag(
85 const gfx::Point& point_in_parent, 85 const gfx::Point& point_in_parent,
86 int window_component, 86 int window_component,
87 aura::client::WindowMoveSource source, 87 aura::client::WindowMoveSource source,
88 const base::Callback<void(bool success)>& end_closure) { 88 const base::Callback<void(bool success)>& end_closure) {
89 toplevel_window_event_handler_.AttemptToStartDrag( 89 toplevel_window_event_handler_.AttemptToStartDrag(
90 wm_window_, point_in_parent, window_component, source, 90 wm_window_, point_in_parent, window_component, source,
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 toplevel_window_event_handler_.RevertDrag(); 146 toplevel_window_event_handler_.RevertDrag();
147 } 147 }
148 148
149 void MoveEventHandler::OnWindowDestroying(aura::Window* window) { 149 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
150 DCHECK_EQ(wm_window_->aura_window(), window); 150 DCHECK_EQ(wm_window_->aura_window(), window);
151 Detach(); 151 Detach();
152 } 152 }
153 153
154 } // namespace mus 154 } // namespace mus
155 } // namespace ash 155 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/move_event_handler.h ('k') | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698