Moves couple of WmShell methods to standalone functions

ash/wm/window_util.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/window_util.h"
 
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/wm_shelf.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_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/capture_client.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
@@ skipping 37 matching lines @@
 }
 
 aura::Window* GetActivatableWindow(aura::Window* window) {
   return ::wm::GetActivatableWindow(window);
 }
 
 bool CanActivateWindow(aura::Window* window) {
   return ::wm::CanActivateWindow(window);
 }
 
+aura::Window* GetFocusedWindow() {
+  return aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
+      ->GetFocusedWindow();
+}
+
+aura::Window* GetCaptureWindow() {
+  return aura::client::GetCaptureWindow(Shell::GetPrimaryRootWindow());
+}
+
 bool IsWindowUserPositionable(aura::Window* window) {
   return GetWindowState(window)->IsUserPositionable();
 }
 
 void PinWindow(aura::Window* window, bool trusted) {
   wm::WMEvent event(trusted ? wm::WM_EVENT_TRUSTED_PIN : wm::WM_EVENT_PIN);
   wm::GetWindowState(window)->OnWMEvent(&event);
 }
 
 void SetAutoHideShelf(aura::Window* window, bool autohide) {
@@ skipping 32 matching lines @@
 }
 
 void SetSnapsChildrenToPhysicalPixelBoundary(aura::Window* container) {
   DCHECK(!container->GetProperty(kSnapChildrenToPixelBoundary))
       << container->GetName();
   container->SetProperty(kSnapChildrenToPixelBoundary, true);
 }
 
 }  // namespace wm
 }  // namespace ash