Moves couple of WmShell methods to standalone functions

ash/common/wm/window_positioning_utils.cc

 // Copyright 2016 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/wm/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.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_util.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
@@ skipping 119 matching lines @@
     if (dst_root != window->GetRootWindow()) {
       int container_id = window->GetParent()->GetShellWindowId();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
       if (!SystemModalContainerLayoutManager::IsModalBackground(window))
         dst_container = dst_root->GetChildByShellWindowId(container_id);
     }
 
     if (dst_container && window->GetParent() != dst_container) {
-      WmWindow* focused = WmShell::Get()->GetFocusedWindow();
-      WmWindow* active = WmShell::Get()->GetActiveWindow();
+      WmWindow* focused = WmWindow::Get(GetFocusedWindow());
+      WmWindow* active = WmWindow::Get(GetActiveWindow());
 
       aura::WindowTracker tracker;
       if (focused)
         tracker.Add(focused->aura_window());
       if (active && focused != active)
         tracker.Add(active->aura_window());
 
       gfx::Point origin = bounds_in_screen.origin();
       const gfx::Point display_origin = display.bounds().origin();
       origin.Offset(-display_origin.x(), -display_origin.y());
@@ skipping 24 matching lines @@
   }
   gfx::Point origin(bounds_in_screen.origin());
   const gfx::Point display_origin =
       window->GetDisplayNearestWindow().bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds_in_screen.size()));
 }
 
 }  // namespace wm
 }  // namespace ash