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

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

Issue 2906693003: [mus+ash] Removes WmWindow from screen_dimmer and video_detector (Closed)
Patch Set: [mus+ash] Removes WmWindow from screen_dimmer and video_detector 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') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | 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 ec1e3b958ce8b4e8a2aed3f8bf228436d7666978..940ce0267a51209029ac0b44f977a168056be548 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -304,12 +304,11 @@ void WorkspaceLayoutManager::OnDisplayMetricsChanged(
//////////////////////////////////////////////////////////////////////////////
// WorkspaceLayoutManager, ShellObserver implementation:
-void WorkspaceLayoutManager::OnFullscreenStateChanged(bool is_fullscreen,
- WmWindow* root_window) {
- if (root_window->aura_window() != root_window_ ||
- is_fullscreen_ == is_fullscreen) {
+void WorkspaceLayoutManager::OnFullscreenStateChanged(
+ bool is_fullscreen,
+ aura::Window* root_window) {
+ if (root_window != root_window_ || is_fullscreen_ == is_fullscreen)
return;
- }
is_fullscreen_ = is_fullscreen;
if (Shell::Get()->screen_pinning_controller()->IsPinned()) {
@@ -383,8 +382,7 @@ void WorkspaceLayoutManager::UpdateFullscreenState() {
return;
bool is_fullscreen = wm::GetWindowForFullscreenMode(window_) != nullptr;
if (is_fullscreen != is_fullscreen_) {
- Shell::Get()->NotifyFullscreenStateChanged(is_fullscreen,
- WmWindow::Get(root_window_));
+ Shell::Get()->NotifyFullscreenStateChanged(is_fullscreen, root_window_);
is_fullscreen_ = is_fullscreen;
}
}
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698