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

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

Issue 2297893002: Merges RootWindowControllerCommon into WmRootWindowController (Closed)
Patch Set: feedback Created 4 years, 4 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/common/wm_root_window_controller.cc ('k') | ash/mus/bridge/wm_root_window_controller_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 067182099486de6a764e11caff334c6f6eac9b37..a154256c636e1b78fc663d053530e1f3918d5eb6 100644
--- a/ash/mus/bridge/wm_root_window_controller_mus.h
+++ b/ash/mus/bridge/wm_root_window_controller_mus.h
@@ -7,7 +7,6 @@
#include "ash/common/wm_root_window_controller.h"
#include "base/macros.h"
-#include "base/observer_list.h"
namespace display {
class Display;
@@ -52,10 +51,6 @@ class WmRootWindowControllerMus : public WmRootWindowController {
// WmRootWindowController:
bool HasShelf() override;
WmShell* GetShell() override;
- wm::WorkspaceWindowState GetWorkspaceWindowState() override;
- void SetMaximizeBackdropDelegate(
- std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate)
- override;
AlwaysOnTopController* GetAlwaysOnTopController() override;
WmShelf* GetShelf() override;
WmWindow* GetWindow() override;
@@ -65,10 +60,10 @@ class WmRootWindowControllerMus : public WmRootWindowController {
views::Widget::InitParams* init_params) override;
WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
gfx::Point GetLastMouseLocationInRoot() override;
- void AddObserver(WmRootWindowControllerObserver* observer) override;
- void RemoveObserver(WmRootWindowControllerObserver* observer) override;
private:
+ friend class RootWindowController;
+
WmShellMus* shell_;
RootWindowController* root_window_controller_;
base::ObserverList<WmRootWindowControllerObserver> observers_;
« no previous file with comments | « ash/common/wm_root_window_controller.cc ('k') | ash/mus/bridge/wm_root_window_controller_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698