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

Unified Diff: ash/desktop_background/desktop_background_controller.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
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
« no previous file with comments | « ash/desktop_background/desktop_background_controller.h ('k') | ash/high_contrast/high_contrast_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698