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_, |