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

Side by Side Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2041423003: Converts ShellObserver from aura::Window to ash::WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/aura/wm_root_window_controller_aura.h" 5 #include "ash/aura/wm_root_window_controller_aura.h"
6 6
7 #include "ash/aura/wm_shelf_aura.h" 7 #include "ash/aura/wm_shelf_aura.h"
8 #include "ash/aura/wm_shell_aura.h" 8 #include "ash/aura/wm_shell_aura.h"
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/wm_root_window_controller_observer.h" 10 #include "ash/common/wm_root_window_controller_observer.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 observers_.RemoveObserver(observer); 117 observers_.RemoveObserver(observer);
118 } 118 }
119 119
120 void WmRootWindowControllerAura::OnDisplayWorkAreaInsetsChanged() { 120 void WmRootWindowControllerAura::OnDisplayWorkAreaInsetsChanged() {
121 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 121 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
122 OnWorkAreaChanged()); 122 OnWorkAreaChanged());
123 } 123 }
124 124
125 void WmRootWindowControllerAura::OnFullscreenStateChanged( 125 void WmRootWindowControllerAura::OnFullscreenStateChanged(
126 bool is_fullscreen, 126 bool is_fullscreen,
127 aura::Window* root_window) { 127 WmWindow* root_window) {
128 if (root_window != root_window_controller_->GetRootWindow()) 128 if (WmWindowAura::GetAuraWindow(root_window) !=
129 root_window_controller_->GetRootWindow())
129 return; 130 return;
130 131
131 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 132 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
132 OnFullscreenStateChanged(is_fullscreen)); 133 OnFullscreenStateChanged(is_fullscreen));
133 } 134 }
134 135
135 void WmRootWindowControllerAura::OnShelfAlignmentChanged( 136 void WmRootWindowControllerAura::OnShelfAlignmentChanged(
136 aura::Window* root_window) { 137 WmWindow* root_window) {
137 if (root_window != root_window_controller_->GetRootWindow()) 138 if (WmWindowAura::GetAuraWindow(root_window) !=
139 root_window_controller_->GetRootWindow())
138 return; 140 return;
139 141
140 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 142 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
141 OnShelfAlignmentChanged()); 143 OnShelfAlignmentChanged());
142 } 144 }
143 145
144 } // namespace ash 146 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/desktop_background/desktop_background_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698