| 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 67fa439caf3c92ea749f7cd0ca5892a9ce3d99ee..dc0c299e59838c4160d6d0a95107fa0345818203 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -119,6 +119,11 @@ bool WmShellMus::IsScreenLocked() {
|
| return false;
|
| }
|
|
|
| +bool WmShellMus::CanShowWindowForUser(WmWindow* window) {
|
| + NOTIMPLEMENTED();
|
| + return true;
|
| +}
|
| +
|
| void WmShellMus::LockCursor() {
|
| NOTIMPLEMENTED();
|
| }
|
| @@ -181,15 +186,8 @@ void WmShellMus::RemoveOverviewModeObserver(WmOverviewModeObserver* observer) {
|
|
|
| // static
|
| bool WmShellMus::IsActivationParent(::mus::Window* window) {
|
| - if (!window)
|
| - return false;
|
| -
|
| - const int shell_window_id = WmWindowMus::Get(window)->GetShellWindowId();
|
| - for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
|
| - if (shell_window_id == kActivatableShellWindowIds[i])
|
| - return true;
|
| - }
|
| - return false;
|
| + return window && IsActivatableShellWindowId(
|
| + WmWindowMus::Get(window)->GetShellWindowId());
|
| }
|
|
|
| void WmShellMus::RemoveClientObserver() {
|
|
|