Removes couple of methods from WmWindow

ash/common/accelerators/debug_commands.cc

 // Copyright 2013 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/common/accelerators/debug_commands.h"
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"
@@ skipping 17 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/debug_utils.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace debug {
 namespace {
 
 void HandlePrintLayerHierarchy() {
-  for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
-    ui::Layer* layer = root->GetLayer();
+  for (aura::Window* root : Shell::Get()->GetAllRootWindows()) {
+    ui::Layer* layer = root->layer();
     if (layer)
       ui::PrintLayerHierarchy(
-          layer, root->GetRootWindowController()->GetLastMouseLocationInRoot());
+          layer,
+          RootWindowController::ForWindow(root)->GetLastMouseLocationInRoot());
   }
 }
 
 void HandlePrintViewHierarchy() {
-  WmWindow* active_window = WmWindow::Get(wm::GetActiveWindow());
+  aura::Window* active_window = wm::GetActiveWindow();
   if (!active_window)
     return;
-  views::Widget* widget = active_window->GetInternalWidget();
+  views::Widget* widget = WmWindow::Get(active_window)->GetInternalWidget();
   if (!widget)
     return;
   views::PrintViewHierarchy(widget->GetRootView());
 }
 
-void PrintWindowHierarchy(const WmWindow* active_window,
-                          WmWindow* window,
+void PrintWindowHierarchy(const aura::Window* active_window,
+                          aura::Window* window,
                           int indent,
                           std::ostringstream* out) {
   std::string indent_str(indent, ' ');
   std::string name(window->GetName());
   if (name.empty())
     name = "\"\"";
   *out << indent_str << name << " (" << window << ")"
-       << " type=" << window->GetType()
+       << " type=" << window->type()
        << ((window == active_window) ? " [active] " : " ")
        << (window->IsVisible() ? " visible " : " ")
-       << window->GetBounds().ToString()
-       << (window->aura_window()->GetProperty(kSnapChildrenToPixelBoundary)
-               ? " [snapped] "
-               : "")
+       << window->bounds().ToString()
+       << (window->GetProperty(kSnapChildrenToPixelBoundary) ? " [snapped] "
+                                                             : "")
        << ", subpixel offset="
-       << window->GetLayer()->subpixel_position_offset().ToString() << '\n';
+       << window->layer()->subpixel_position_offset().ToString() << '\n';
 
-  for (WmWindow* child : window->GetChildren())
+  for (aura::Window* child : window->children())
     PrintWindowHierarchy(active_window, child, indent + 3, out);
 }
 
 void HandlePrintWindowHierarchy() {
-  WmWindow* active_window = WmWindow::Get(wm::GetActiveWindow());
-  WmWindow::Windows roots = WmShell::Get()->GetAllRootWindows();
+  aura::Window* active_window = wm::GetActiveWindow();
+  aura::Window::Windows roots = Shell::Get()->GetAllRootWindows();
   for (size_t i = 0; i < roots.size(); ++i) {
     std::ostringstream out;
     out << "RootWindow " << i << ":\n";
     PrintWindowHierarchy(active_window, roots[i], 0, &out);
     // Error so logs can be collected from end-users.
     LOG(ERROR) << out.str();
   }
 }
 
 gfx::ImageSkia CreateWallpaperImage(SkColor fill, SkColor rect) {
@@ skipping 119 matching lines @@
     case DEBUG_TRIGGER_CRASH:
       HandleTriggerCrash();
       break;
     default:
       break;
   }
 }
 
 }  // namespace debug
 }  // namespace ash