Moves couple of WmShell methods to standalone functions

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/key_event_watcher_aura.h"
@@ skipping 37 matching lines @@
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/views/mus/pointer_watcher_event_router.h"
-#include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/focus_controller.h"
 
 namespace ash {
 namespace mus {
 
 namespace {
 
 // TODO(jamescook): After ShellDelegate is ported to ash/common use
 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version
 // of SessionStateDelegate.
 class SessionStateDelegateStub : public SessionStateDelegate {
@@ skipping 88 matching lines @@
 }
 
 bool WmShellMus::IsRunningInMash() const {
   return GetConfig() == Config::MASH;
 }
 
 Config WmShellMus::GetConfig() const {
   return window_manager_->config();
 }
 
-WmWindow* WmShellMus::GetFocusedWindow() {
-  // TODO: remove as both WmShells use same implementation.
-  return WmWindow::Get(
-      aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
-          ->GetFocusedWindow());
-}
-
-WmWindow* WmShellMus::GetActiveWindow() {
-  // TODO: remove as both WmShells use same implementation.
-  return WmWindow::Get(wm::GetActiveWindow());
-}
-
-WmWindow* WmShellMus::GetCaptureWindow() {
-  // TODO: remove as both WmShells use same implementation.
-  return WmWindow::Get(::wm::CaptureController::Get()->GetCaptureWindow());
-}
-
 WmWindow* WmShellMus::GetPrimaryRootWindow() {
   // NOTE: This is called before the RootWindowController has been created, so
   // it can't call through to RootWindowController to get all windows.
   return primary_root_window_;
 }
 
 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
   RootWindowController* root_window_controller =
       GetRootWindowControllerWithDisplayId(display_id);
   return root_window_controller
@@ skipping 289 matching lines @@
   mash_state_->accelerator_controller_registrar =
       base ::MakeUnique<AcceleratorControllerRegistrar>(
           window_manager_, accelerator_namespace_id);
   return base::MakeUnique<AcceleratorController>(
       mash_state_->accelerator_controller_delegate.get(),
       mash_state_->accelerator_controller_registrar.get());
 }
 
 }  // namespace mus
 }  // namespace ash