| Index: ash/mus/bridge/wm_shell_mus.cc
|
| diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
|
| index 8f81a01f04b114e1bd0d41c59e2ce4dc612dcc39..b25ded7efac3d3360f84566118be2170826dba0d 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -55,8 +55,6 @@
|
| #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 {
|
| @@ -165,23 +163,6 @@ 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.
|
|
|