| 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 4615290a0887c0c2b70e3dffa53e2eb244c0a6c8..c94d3f13e8d4e6611e8e60a98bda07a61e8ba65b 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.h
|
| +++ b/ash/mus/bridge/wm_shell_mus.h
|
| @@ -19,6 +19,9 @@ class WindowTreeClient;
|
| }
|
|
|
| namespace ash {
|
| +
|
| +class WmShellCommon;
|
| +
|
| namespace mus {
|
|
|
| class WmRootWindowControllerMus;
|
| @@ -42,14 +45,13 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
|
| WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
|
|
|
| // WmShell:
|
| + MruWindowTracker* GetMruWindowTracker() override;
|
| WmWindow* NewContainerWindow() override;
|
| WmWindow* GetFocusedWindow() override;
|
| WmWindow* GetActiveWindow() override;
|
| WmWindow* GetPrimaryRootWindow() override;
|
| WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
|
| WmWindow* GetRootWindowForNewWindows() override;
|
| - std::vector<WmWindow*> GetMruWindowList() override;
|
| - std::vector<WmWindow*> GetMruWindowListIgnoreModals() override;
|
| bool IsForceMaximizeOnFirstRun() override;
|
| bool CanShowWindowForUser(WmWindow* window) override;
|
| void LockCursor() override;
|
| @@ -82,6 +84,8 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
|
|
|
| ::mus::WindowTreeClient* client_;
|
|
|
| + std::unique_ptr<WmShellCommon> wm_shell_common_;
|
| +
|
| std::vector<WmRootWindowControllerMus*> root_window_controllers_;
|
|
|
| std::unique_ptr<SessionStateDelegate> session_state_delegate_;
|
|
|