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

Unified Diff: ash/wallpaper/wallpaper_controller.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 7 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/virtual_keyboard_controller.cc ('k') | ash/wallpaper/wallpaper_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wallpaper/wallpaper_controller.cc
diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc
index 002449d84d571d28853e5f0d682a09ca1de03767..159890a5a88f809ee2e8786a562a49c682b180c6 100644
--- a/ash/wallpaper/wallpaper_controller.cc
+++ b/ash/wallpaper/wallpaper_controller.cc
@@ -327,7 +327,7 @@ bool WallpaperController::ReparentWallpaper(int container) {
root_window_controller->wallpaper_widget_controller();
if (wallpaper_widget_controller) {
moved |= wallpaper_widget_controller->Reparent(
- root_window_controller->GetWindow(), container);
+ root_window_controller->GetRootWindow(), container);
}
// During wallpaper show animations the controller lives in
// AnimatingWallpaperWidgetController owned by RootWindowController.
@@ -341,7 +341,7 @@ bool WallpaperController::ReparentWallpaper(int container) {
: nullptr;
if (animating_controller) {
moved |= animating_controller->Reparent(
- root_window_controller->GetWindow(), container);
+ root_window_controller->GetRootWindow(), container);
}
}
return moved;
« no previous file with comments | « ash/virtual_keyboard_controller.cc ('k') | ash/wallpaper/wallpaper_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698