mash: remove more shell/shelf WmWindow usage.

ash/shell.h

 // Copyright (c) 2012 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_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 218 matching lines @@
 
   // Returns the primary root Window. The primary root Window is the one that
   // has a launcher.
   static aura::Window* GetPrimaryRootWindow();
 
   // Returns the root window that newly created windows should be added to.
   // Value can be temporarily overridden using ScopedRootWindowForNewWindows.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
   static aura::Window* GetRootWindowForNewWindows();
-  static WmWindow* GetWmRootWindowForNewWindows();
 
   // Returns all root windows.
   static aura::Window::Windows GetAllRootWindows();
 
   static aura::Window* GetContainer(aura::Window* root_window,
                                     int container_id);
   static const aura::Window* GetContainer(const aura::Window* root_window,
                                           int container_id);
 
   // TODO(sky): move this and WindowManagerClient into ShellMash that is owned
@@ skipping 257 matching lines @@
 
   UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); }
 
   void SetTouchHudProjectionEnabled(bool enabled);
 
   bool is_touch_hud_projection_enabled() const {
     return is_touch_hud_projection_enabled_;
   }
 
   // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
-  void set_root_window_for_new_windows(WmWindow* root) {
+  void set_root_window_for_new_windows(aura::Window* root) {
     root_window_for_new_windows_ = root;
   }
 
   // Creates instance of FirstRunHelper. Caller is responsible for deleting
   // returned object.
   ash::FirstRunHelper* CreateFirstRunHelper();
 
   void SetLargeCursorSizeInDip(int large_cursor_size_in_dip);
 
   // Toggles cursor compositing on/off. Native cursor is disabled when cursor
@@ skipping 280 matching lines @@
 
   // Cursor may be hidden on certain key events in Chrome OS, whereas we never
   // hide the cursor on Windows.
   std::unique_ptr<::wm::CursorManager> cursor_manager_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   bool is_touch_hud_projection_enabled_;
 
-  // See comment for GetWmRootWindowForNewWindows().
-  WmWindow* root_window_for_new_windows_ = nullptr;
-  WmWindow* scoped_root_window_for_new_windows_ = nullptr;
+  // See comment for GetRootWindowForNewWindows().
+  aura::Window* root_window_for_new_windows_ = nullptr;
+  aura::Window* scoped_root_window_for_new_windows_ = nullptr;
 
   // Injected content::GPUDataManager support.
   std::unique_ptr<GPUSupport> gpu_support_;
 
   std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
 
   std::unique_ptr<AppListDelegateImpl> app_list_delegate_impl_;
 
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_