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

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

Issue 2620913003: Removes WmRootWindowController subclasses (Closed)
Patch Set: spelling 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/BUILD.gn ('k') | ash/mus/bridge/wm_root_window_controller_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4f18f1215fa5634448c2ff38138d547e32322e5a..8f96d88cdcebb6e348108fe37fc76f9b67fdfce4 100644
--- a/ash/mus/bridge/wm_lookup_mus.cc
+++ b/ash/mus/bridge/wm_lookup_mus.cc
@@ -4,9 +4,9 @@
#include "ash/mus/bridge/wm_lookup_mus.h"
-#include "ash/mus/bridge/wm_root_window_controller_mus.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"
namespace ash {
@@ -23,7 +23,10 @@ WmLookupMus::~WmLookupMus() {
WmRootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId(
int64_t id) {
- return WmShellMus::Get()->GetRootWindowControllerWithDisplayId(id);
+ return WmShellMus::Get()
+ ->GetRootWindowControllerWithDisplayId(id)
+ ->ash_root_window_controller()
+ ->wm_root_window_controller();
}
WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_root_window_controller_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698