| 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 fc86876193060fbdd669af561fdba06fa477ce1a..43ec36fa35c0822300093b33060eeed21ab6cf0d 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.h
|
| +++ b/ash/mus/bridge/wm_shell_mus.h
|
| @@ -32,7 +32,6 @@ class ImmersiveHandlerFactoryMus;
|
| class WindowManager;
|
| class WmRootWindowControllerMus;
|
| class WmShellMusTestApi;
|
| -class WmWindowMus;
|
|
|
| // WmShell implementation for mus.
|
| class WmShellMus : public WmShell,
|
| @@ -48,10 +47,6 @@ class WmShellMus : public WmShell,
|
| void AddRootWindowController(WmRootWindowControllerMus* controller);
|
| void RemoveRootWindowController(WmRootWindowControllerMus* controller);
|
|
|
| - // Returns the ancestor of |window| (including |window|) that is considered
|
| - // toplevel. |window| may be null.
|
| - static WmWindowMus* GetToplevelAncestor(aura::Window* window);
|
| -
|
| WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
|
|
|
| AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
|
| @@ -123,9 +118,6 @@ class WmShellMus : public WmShell,
|
| private:
|
| friend class WmShellMusTestApi;
|
|
|
| - // Returns true if |window| is a window that can have active children.
|
| - static bool IsActivationParent(aura::Window* window);
|
| -
|
| // aura::client::ActivationChangeObserver:
|
| void OnWindowActivated(ActivationReason reason,
|
| aura::Window* gained_active,
|
|
|