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

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

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/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index d7e3caccfd163ccd04114264ee8a0a642f609bdc..4b13ba484446ef767ee057e6ed27cd4a679b3680 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -29,8 +29,8 @@ namespace mus {
class AcceleratorControllerDelegateMus;
class AcceleratorControllerRegistrar;
class ImmersiveHandlerFactoryMus;
+class RootWindowController;
class WindowManager;
-class WmRootWindowControllerMus;
class WmShellMusTestApi;
// WmShell implementation for mus.
@@ -44,10 +44,10 @@ class WmShellMus : public WmShell,
static WmShellMus* Get();
- void AddRootWindowController(WmRootWindowControllerMus* controller);
- void RemoveRootWindowController(WmRootWindowControllerMus* controller);
+ void AddRootWindowController(RootWindowController* controller);
+ void RemoveRootWindowController(RootWindowController* controller);
- WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
+ RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
return accelerator_controller_delegate_.get();
@@ -125,7 +125,7 @@ class WmShellMus : public WmShell,
views::PointerWatcherEventRouter* pointer_watcher_event_router_;
- std::vector<WmRootWindowControllerMus*> root_window_controllers_;
+ std::vector<RootWindowController*> root_window_controllers_;
std::unique_ptr<AcceleratorControllerDelegateMus>
accelerator_controller_delegate_;
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698