[mus+ash] removes WmWindow, wm_window.h and wm_window.cc

ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 45 matching lines @@
 class Shelf;
 class ShelfLayoutManager;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
-class WmWindow;
 class WorkspaceController;
 
 namespace mus {
 class WindowManager;
 }
 
 namespace wm {
 class RootWindowLayoutManager;
 }
 
@@ skipping 41 matching lines @@
   // TODO(sky): move these to a separate class or use AshWindowTreeHost in
   // mash. http://crbug.com/671246.
   AshWindowTreeHost* ash_host() { return ash_host_.get(); }
   const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
 
   aura::WindowTreeHost* GetHost();
   const aura::WindowTreeHost* GetHost() const;
   aura::Window* GetRootWindow();
   const aura::Window* GetRootWindow() const;
 
-  // TODO(sky): remove these. http://crbug.com/671246.
-  WmWindow* GetWindow() {
-    return const_cast<WmWindow*>(
-        const_cast<const RootWindowController*>(this)->GetWindow());
-  }
-  const WmWindow* GetWindow() const;
-
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   wm::WorkspaceWindowState GetWorkspaceWindowState();
 
   Shelf* shelf() const { return shelf_.get(); }
 
   // Initializes the shelf for this root window and notifies observers.
   void InitializeShelf();
@@ skipping 55 matching lines @@
   // may extend outside the bounds of the window.
   aura::Window* FindEventTarget(const gfx::Point& location_in_screen);
 
   // Gets the last location seen in a mouse event in this root window's
   // coordinates. This may return a point outside the root window's bounds.
   gfx::Point GetLastMouseLocationInRoot();
 
   aura::Window* GetContainer(int container_id);
   const aura::Window* GetContainer(int container_id) const;
 
-  // TODO(sky): remove these. http://crbug.com/671246.
-  WmWindow* GetWmContainer(int container_id) {
-    return const_cast<WmWindow*>(
-        const_cast<const RootWindowController*>(this)->GetWmContainer(
-            container_id));
-  }
-  const WmWindow* GetWmContainer(int container_id) const;
-
   WallpaperWidgetController* wallpaper_widget_controller() {
     return wallpaper_widget_controller_.get();
   }
   void SetWallpaperWidgetController(WallpaperWidgetController* controller);
 
   AnimatingWallpaperWidgetController* animating_wallpaper_widget_controller() {
     return animating_wallpaper_widget_controller_.get();
   }
   void SetAnimatingWallpaperWidgetController(
       AnimatingWallpaperWidgetController* controller);
@@ skipping 149 matching lines @@
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_