Index: ash/desktop_background/desktop_background_controller.cc |
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc |
index 1165b51ca4989feb2828f7165b301d61647d24e5..600558d537654d87d57bd9df7e2bc2c66e2a103c 100644 |
--- a/ash/desktop_background/desktop_background_controller.cc |
+++ b/ash/desktop_background/desktop_background_controller.cc |
@@ -5,6 +5,7 @@ |
#include "ash/desktop_background/desktop_background_controller.h" |
#include "ash/ash_switches.h" |
+#include "ash/aura/wm_window_aura.h" |
#include "ash/common/shell_window_ids.h" |
#include "ash/common/wm/root_window_layout_manager.h" |
#include "ash/desktop_background/desktop_background_controller_observer.h" |
@@ -142,7 +143,7 @@ void DesktopBackgroundController::OnDisplayConfigurationChanged() { |
} |
} |
-void DesktopBackgroundController::OnRootWindowAdded(aura::Window* root_window) { |
+void DesktopBackgroundController::OnRootWindowAdded(WmWindow* root_window) { |
// The background hasn't been set yet. |
if (desktop_background_mode_ == BACKGROUND_NONE) |
return; |
@@ -156,7 +157,7 @@ void DesktopBackgroundController::OnRootWindowAdded(aura::Window* root_window) { |
UpdateWallpaper(true /* clear cache */); |
} |
- InstallDesktopController(root_window); |
+ InstallDesktopController(WmWindowAura::GetAuraWindow(root_window)); |
} |
// static |