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

Unified Diff: ash/mus/bridge/wm_lookup_mus.cc

Issue 2625873007: Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus (Closed)
Patch Set: cleanup 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
Index: ash/mus/bridge/wm_lookup_mus.cc
diff --git a/ash/mus/bridge/wm_lookup_mus.cc b/ash/mus/bridge/wm_lookup_mus.cc
index b9b0be19a1704e38dd3a82b90279fd2e43185773..685d1faebd0d3ed7a11516c6f9d1780af52e1073 100644
--- a/ash/mus/bridge/wm_lookup_mus.cc
+++ b/ash/mus/bridge/wm_lookup_mus.cc
@@ -4,8 +4,8 @@
#include "ash/mus/bridge/wm_lookup_mus.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/mus/bridge/wm_shell_mus.h"
-#include "ash/mus/bridge/wm_window_mus.h"
#include "ash/mus/root_window_controller.h"
#include "ui/views/widget/widget.h"
@@ -29,7 +29,7 @@ ash::RootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId(
}
WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
- return WmWindowMus::Get(widget);
+ return ash::WmWindowAura::Get(widget->GetNativeWindow());
msw 2017/01/12 00:14:42 q: is ash:: needed here and elsewhere in this CL i
sky 2017/01/12 14:43:44 Yes. I got all sorts of compile errors without it.
}
} // namespace mus

Powered by Google App Engine
This is Rietveld 408576698