Removes/promotes functions from WmWindowMus to WmWindowAura

ash/mus/bridge/wm_shell_mus.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 14 matching lines @@
 
 namespace ash {
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 class WmRootWindowControllerMus;
 class WmShellMusTestApi;
-class WmWindowMus;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell,
                    public aura::client::ActivationChangeObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
              WindowManager* window_manager,
              views::PointerWatcherEventRouter* pointer_watcher_event_router);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
 
   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() {
     return accelerator_controller_delegate_.get();
   }
 
   aura::WindowTreeClient* window_tree_client();
 
   WindowManager* window_manager() { return window_manager_; }
 
@@ skipping 51 matching lines @@
   void RequestShutdown() override;
   bool IsTouchDown() override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
   void SetLaserPointerEnabled(bool enabled) override;
 #endif
 
  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,
                          aura::Window* lost_active) override;
 
   WindowManager* window_manager_;
 
   views::PointerWatcherEventRouter* pointer_watcher_event_router_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
   std::unique_ptr<AcceleratorControllerRegistrar>
       accelerator_controller_registrar_;
   std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_