Removes a couple more functions from WmWindow

ash/wm/workspace_controller.cc

 // 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.
 
 #include "ash/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell_port.h"
 #include "ash/wm/fullscreen_window_finder.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_aura.h"
 #include "ash/wm/wm_window_animations.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 
 namespace ash {
 namespace {
 
 // Amount of time to pause before animating anything. Only used during initial
 // animation (when logging in).
 const int kInitialPauseTimeMS = 750;
 
@@ skipping 24 matching lines @@
     return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const WmWindow* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
   if (fullscreen && !fullscreen->GetWindowState()->ignored_by_shelf())
     return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
 
   const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds());
   bool window_overlaps_launcher = false;
   // The default container may contain windows that may overlap the launcher
   // shelf and affect its transparency.
-  WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
-      kShellWindowId_DefaultContainer);
-  for (WmWindow* window : container->GetChildren()) {
-    wm::WindowState* window_state = window->GetWindowState();
+  aura::Window* container =
+      viewport_->GetRootWindow()->aura_window()->GetChildById(
+          kShellWindowId_DefaultContainer);
+  for (aura::Window* window : container->children()) {
+    wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_state->ignored_by_shelf() ||
-        (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
+        (window->layer() && !window->layer()->GetTargetVisibility())) {
       continue;
     }
     if (window_state->IsMaximized())
       return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
-    window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
+    window_overlaps_launcher |= window->bounds().Intersects(shelf_bounds);
   }
 
   return window_overlaps_launcher
              ? wm::WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF
              : wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
 void WorkspaceController::DoInitialAnimation() {
   viewport_->Show();
 
@@ skipping 30 matching lines @@
 void WorkspaceController::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(WmWindow::Get(window), viewport_);
   viewport_->aura_window()->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
   layout_manager_ = nullptr;
 }
 
 }  // namespace ash