| Index: ash/wm/workspace/workspace_layout_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
|
| index 3c3d328a3d2e4b20467da7661e7713ba6c3dfec6..ec1e3b958ce8b4e8a2aed3f8bf228436d7666978 100644
|
| --- a/ash/wm/workspace/workspace_layout_manager.cc
|
| +++ b/ash/wm/workspace/workspace_layout_manager.cc
|
| @@ -323,7 +323,7 @@ void WorkspaceLayoutManager::OnFullscreenStateChanged(bool is_fullscreen,
|
| : nullptr);
|
| }
|
|
|
| -void WorkspaceLayoutManager::OnPinnedStateChanged(WmWindow* pinned_window) {
|
| +void WorkspaceLayoutManager::OnPinnedStateChanged(aura::Window* pinned_window) {
|
| const bool is_pinned = Shell::Get()->screen_pinning_controller()->IsPinned();
|
| if (!is_pinned && is_fullscreen_) {
|
| // On exiting from pinned mode, if the workspace is still in fullscreen
|
| @@ -333,7 +333,7 @@ void WorkspaceLayoutManager::OnPinnedStateChanged(WmWindow* pinned_window) {
|
| return;
|
| }
|
|
|
| - UpdateAlwaysOnTop(is_pinned ? pinned_window->aura_window() : nullptr);
|
| + UpdateAlwaysOnTop(is_pinned ? pinned_window : nullptr);
|
| }
|
|
|
| void WorkspaceLayoutManager::OnVirtualKeyboardStateChanged(
|
|
|