Moves couple of WmShell methods to standalone functions

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"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
+#include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #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();
     if (layer)
       ui::PrintLayerHierarchy(
           layer, root->GetRootWindowController()->GetLastMouseLocationInRoot());
   }
 }
 
 void HandlePrintViewHierarchy() {
-  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
+  WmWindow* active_window = WmWindow::Get(wm::GetActiveWindow());
   if (!active_window)
     return;
   views::Widget* widget = active_window->GetInternalWidget();
   if (!widget)
     return;
   views::PrintViewHierarchy(widget->GetRootView());
 }
 
 void PrintWindowHierarchy(const WmWindow* active_window,
                           WmWindow* window,
@@ skipping 12 matching lines @@
                ? " [snapped] "
                : "")
        << ", subpixel offset="
        << window->GetLayer()->subpixel_position_offset().ToString() << '\n';
 
   for (WmWindow* child : window->GetChildren())
     PrintWindowHierarchy(active_window, child, indent + 3, out);
 }
 
 void HandlePrintWindowHierarchy() {
-  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
+  WmWindow* active_window = WmWindow::Get(wm::GetActiveWindow());
   WmWindow::Windows roots = WmShell::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();
   }
 }
 
@@ skipping 120 matching lines @@
     case DEBUG_TRIGGER_CRASH:
       HandleTriggerCrash();
       break;
     default:
       break;
   }
 }
 
 }  // namespace debug
 }  // namespace ash