Moves couple of WmShell methods to standalone functions

ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/key_event_watcher_aura.h"
@@ skipping 17 matching lines @@
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
 #include "ash/virtual_keyboard_controller.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "base/memory/ptr_util.h"
-#include "ui/aura/client/capture_client.h"
-#include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/display/manager/display_manager.h"
 
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #endif
@@ skipping 22 matching lines @@
 }
 
 bool WmShellAura::IsRunningInMash() const {
   return false;
 }
 
 Config WmShellAura::GetConfig() const {
   return Config::CLASSIC;
 }
 
-WmWindow* WmShellAura::GetFocusedWindow() {
-  return WmWindow::Get(
-      aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
-          ->GetFocusedWindow());
-}
-
-WmWindow* WmShellAura::GetActiveWindow() {
-  return WmWindow::Get(wm::GetActiveWindow());
-}
-
-WmWindow* WmShellAura::GetCaptureWindow() {
-  // Ash shares capture client among all RootWindowControllers, so we need only
-  // check the primary root.
-  return WmWindow::Get(
-      aura::client::GetCaptureWindow(Shell::GetPrimaryRootWindow()));
-}
-
 WmWindow* WmShellAura::GetPrimaryRootWindow() {
   return WmWindow::Get(
       Shell::GetInstance()->window_tree_host_manager()->GetPrimaryRootWindow());
 }
 
 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
   return WmWindow::Get(Shell::GetInstance()
                            ->window_tree_host_manager()
                            ->GetRootWindowForDisplayId(display_id));
 }
@@ skipping 181 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash