mash: remove more shell/shelf WmWindow usage.

ash/shell_port.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_SHELL_PORT_H_
 #define ASH_SHELL_PORT_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 59 matching lines @@
  public:
   virtual ~ShellPort();
 
   static ShellPort* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   virtual void Shutdown();
 
   virtual Config GetAshConfig() const = 0;
 
-  // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
-  RootWindowController* GetPrimaryRootWindowController();
-
-  virtual WmWindow* GetPrimaryRootWindow() = 0;
+  virtual aura::Window* GetPrimaryRootWindow() = 0;
 
   // Returns the root window for the specified display.
-  virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
+  virtual aura::Window* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Retuns the display info associated with |display_id|.
   // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual const display::ManagedDisplayInfo& GetDisplayInfo(
       int64_t display_id) const = 0;
 
   // Matches that of DisplayManager::IsActiveDisplayId().
   // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual bool IsActiveDisplayId(int64_t display_id) const = 0;
 
@@ skipping 147 matching lines @@
   static ShellPort* instance_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_PORT_H_