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

Unified Diff: ash/sysui/wallpaper_delegate_mus.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Fix nit. Created 4 years, 3 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/shell_unittest.cc ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »
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 db9e58a316e358ce6248194d57439e50afdd3b6e..2833e4b3520fc0ef2b2f488669ee250bba904e91 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/shell.h"
-#include "ash/wallpaper/wallpaper_controller.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wm_shell.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()->wallpaper_controller()->SetWallpaperImage(
+ WmShell::Get()->wallpaper_controller()->SetWallpaperImage(
image, WallpaperLayoutFromMojo(layout));
}
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698