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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/sysui/wallpaper_delegate_mus.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Cleanup Created 4 years, 4 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
« ash/shell.h ('K') | « ash/sysui/sysui_application.cc ('k') | ash/test/test_session_state_animator.h » ('j') | ash/wallpaper/wallpaper_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/wallpaper_delegate_mus.cc
diff --git a/ash/sysui/wallpaper_delegate_mus.cc b/ash/sysui/wallpaper_delegate_mus.cc
index 02106cd79d4d4c34fbc514a5f6c996a332a0a868..db9e58a316e358ce6248194d57439e50afdd3b6e 100644
--- a/ash/sysui/wallpaper_delegate_mus.cc
+++ b/ash/sysui/wallpaper_delegate_mus.cc
@@ -4,8 +4,8 @@
#include "ash/sysui/wallpaper_delegate_mus.h"
-#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.h"
#include "components/wallpaper/wallpaper_layout.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/views/mus/window_manager_connection.h"
@@ -84,7 +84,7 @@ void WallpaperDelegateMus::SetWallpaper(const SkBitmap& wallpaper,
if (wallpaper.isNull())
return;
gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(wallpaper);
- Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(
+ Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(
image, WallpaperLayoutFromMojo(layout));
}
« ash/shell.h ('K') | « ash/sysui/sysui_application.cc ('k') | ash/test/test_session_state_animator.h » ('j') | ash/wallpaper/wallpaper_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698