Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2403)

Unified Diff: ash/wm/workspace/workspace_layout_manager.cc

Issue 2904073002: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (removes unneeded header) Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698