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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 4 years, 8 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
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 61f08edaffd169834ab0307a5d48048c3ccf3d2e..b9d7a1bead63268169eb752a9a9dcb967ac29f96 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -16,6 +16,7 @@
#include "ash/wm/window_positioner.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_state.h"
+#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "ash/wm/wm_event.h"
#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
@@ -200,10 +201,12 @@ void WorkspaceLayoutManager::OnFullscreenStateChanged(
WindowSet windows(windows_);
for (auto window : windows) {
wm::WindowState* window_state = wm::GetWindowState(window);
- if (is_fullscreen)
- window_state->DisableAlwaysOnTop(fullscreen_window);
- else
+ if (is_fullscreen) {
+ window_state->DisableAlwaysOnTop(
+ wm::WmWindowAura::Get(fullscreen_window));
+ } else {
window_state->RestoreAlwaysOnTop();
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698