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

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

Issue 2613793002: Removes/promotes functions from WmWindowMus to WmWindowAura (Closed)
Patch Set: move WmWindowAuraTestApi to ash/test 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 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,
« 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