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

Unified Diff: ash/mus/bridge/wm_root_window_controller_mus.h

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge Created 4 years 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_root_window_controller_mus.h
diff --git a/ash/mus/bridge/wm_root_window_controller_mus.h b/ash/mus/bridge/wm_root_window_controller_mus.h
index ebc5ac3eeb4fc2a37a790740b1b8bace579c53dc..828a4d7a91fe9a0ca0a93f57625eb2b3ed250d1b 100644
--- a/ash/mus/bridge/wm_root_window_controller_mus.h
+++ b/ash/mus/bridge/wm_root_window_controller_mus.h
@@ -8,12 +8,12 @@
#include "ash/common/wm_root_window_controller.h"
#include "base/macros.h"
-namespace display {
-class Display;
+namespace aura {
+class Window;
}
-namespace ui {
-class Window;
+namespace display {
+class Display;
}
namespace ash {
@@ -30,11 +30,11 @@ class WmRootWindowControllerMus : public WmRootWindowController {
RootWindowController* root_window_controller);
~WmRootWindowControllerMus() override;
- static WmRootWindowControllerMus* Get(ui::Window* window) {
+ static WmRootWindowControllerMus* Get(aura::Window* window) {
return const_cast<WmRootWindowControllerMus*>(
- Get(const_cast<const ui::Window*>(window)));
+ Get(const_cast<const aura::Window*>(window)));
}
- static const WmRootWindowControllerMus* Get(const ui::Window* window);
+ static const WmRootWindowControllerMus* Get(const aura::Window* window);
RootWindowController* root_window_controller() {
return root_window_controller_;

Powered by Google App Engine
This is Rietveld 408576698