mash: remove more shell/shelf WmWindow usage.

ash/mus/bridge/shell_port_mash.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_SHELL_PORT_MASH_H_
 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 23 matching lines @@
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 class ShellPortMashTestApi;
 
 // ShellPort implementation for mash/mus. See ash/README.md for more.
 class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
  public:
   // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
   // created. If false, the SessionStateDelegate from Shell is used.
-  ShellPortMash(WmWindow* primary_root_window,
+  ShellPortMash(aura::Window* primary_root_window,
                 WindowManager* window_manager,
                 views::PointerWatcherEventRouter* pointer_watcher_event_router,
                 bool create_session_state_delegate_stub);
   ~ShellPortMash() override;
 
   static ShellPortMash* Get();
 
   ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
 
   AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() {
     return mus_state_->accelerator_controller_delegate.get();
   }
 
   aura::WindowTreeClient* window_tree_client();
 
   WindowManager* window_manager() { return window_manager_; }
 
   // ShellPort:
   void Shutdown() override;
   Config GetAshConfig() const override;
-  WmWindow* GetPrimaryRootWindow() override;
-  WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
+  aura::Window* GetPrimaryRootWindow() override;
+  aura::Window* GetRootWindowForDisplayId(int64_t display_id) override;
   const display::ManagedDisplayInfo& GetDisplayInfo(
       int64_t display_id) const override;
   bool IsActiveDisplayId(int64_t display_id) const override;
   display::Display GetFirstDisplay() const override;
   bool IsInUnifiedMode() const override;
   bool IsInUnifiedModeIgnoreMirroring() const override;
   void SetDisplayWorkAreaInsets(WmWindow* window,
                                 const gfx::Insets& insets) override;
   void LockCursor() override;
   void UnlockCursor() override;
@@ skipping 65 matching lines @@
         accelerator_controller_delegate;
   };
 
   // WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanging() override;
   void OnDisplayConfigurationChanged() override;
 
   WindowManager* window_manager_;
 
   // TODO(sky): remove this once mash supports simple display management.
-  WmWindow* primary_root_window_;
+  aura::Window* primary_root_window_;
 
   // Only one of |mash_state_| or |mus_state_| is created, depending upon
   // Config.
   std::unique_ptr<MashSpecificState> mash_state_;
   std::unique_ptr<MusSpecificState> mus_state_;
 
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellPortMash);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_