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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/move_event_handler.cc
diff --git a/ash/mus/move_event_handler.cc b/ash/mus/move_event_handler.cc
index a4501e3e3e66e69595ae52b95b7335e5859067e9..dbda4d222f14fa2118d95135b2c63348016a3cff 100644
--- a/ash/mus/move_event_handler.cc
+++ b/ash/mus/move_event_handler.cc
@@ -4,7 +4,7 @@
#include "ash/mus/move_event_handler.h"
-#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/mus/bridge/workspace_event_handler_mus.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
#include "ui/aura/mus/window_manager_delegate.h"
@@ -62,7 +62,7 @@ void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure,
MoveEventHandler::MoveEventHandler(
aura::WindowManagerClient* window_manager_client,
aura::Window* window)
- : wm_window_(WmWindowMus::Get(window)),
+ : wm_window_(ash::WmWindowAura::Get(window)),
window_manager_client_(window_manager_client),
toplevel_window_event_handler_(wm_window_->GetShell()) {
window->AddObserver(this);
@@ -77,7 +77,7 @@ MoveEventHandler::~MoveEventHandler() {
// static
MoveEventHandler* MoveEventHandler::GetForWindow(WmWindow* wm_window) {
- return WmWindowMus::GetAuraWindow(wm_window)->GetProperty(
+ return ash::WmWindowAura::GetAuraWindow(wm_window)->GetProperty(
kWmMoveEventHandler);
}
« 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