| 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 a07baf09d976d1a613e9ec4420add7280f15cf90..8794f8554a56ed506ef120e8261ac0bdb4737cbc 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -29,7 +29,6 @@
|
| #include "ash/mus/keyboard_ui_mus.h"
|
| #include "ash/mus/root_window_controller.h"
|
| #include "ash/mus/window_manager.h"
|
| -#include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/shared/immersive_fullscreen_controller.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "components/user_manager/user_info_impl.h"
|
| @@ -181,16 +180,6 @@ void WmShellMus::RemoveRootWindowController(
|
| root_window_controllers_.erase(iter);
|
| }
|
|
|
| -// static
|
| -WmWindowMus* WmShellMus::GetToplevelAncestor(aura::Window* window) {
|
| - while (window) {
|
| - if (IsActivationParent(window->parent()))
|
| - return WmWindowMus::Get(window);
|
| - window = window->parent();
|
| - }
|
| - return nullptr;
|
| -}
|
| -
|
| WmRootWindowControllerMus* WmShellMus::GetRootWindowControllerWithDisplayId(
|
| int64_t id) {
|
| for (WmRootWindowControllerMus* root_window_controller :
|
| @@ -444,12 +433,6 @@ void WmShellMus::SetLaserPointerEnabled(bool enabled) {
|
| }
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| -// static
|
| -bool WmShellMus::IsActivationParent(aura::Window* window) {
|
| - return window && IsActivatableShellWindowId(
|
| - WmWindowMus::Get(window)->GetShellWindowId());
|
| -}
|
| -
|
| // TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
|
| // TODO: Nuke and let client code use ActivationChangeObserver directly.
|
| void WmShellMus::OnWindowActivated(ActivationReason reason,
|
|
|