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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index 8096034a39afc9b9186dde6778708a5333b1c76e..7edf0af90f869e099895076a42b64856b1c6f163 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -124,8 +124,9 @@ void WmRootWindowControllerAura::OnDisplayWorkAreaInsetsChanged() {
void WmRootWindowControllerAura::OnFullscreenStateChanged(
bool is_fullscreen,
- aura::Window* root_window) {
- if (root_window != root_window_controller_->GetRootWindow())
+ WmWindow* root_window) {
+ if (WmWindowAura::GetAuraWindow(root_window) !=
+ root_window_controller_->GetRootWindow())
return;
FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
@@ -133,8 +134,9 @@ void WmRootWindowControllerAura::OnFullscreenStateChanged(
}
void WmRootWindowControllerAura::OnShelfAlignmentChanged(
- aura::Window* root_window) {
- if (root_window != root_window_controller_->GetRootWindow())
+ WmWindow* root_window) {
+ if (WmWindowAura::GetAuraWindow(root_window) !=
+ root_window_controller_->GetRootWindow())
return;
FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
« 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