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

Unified Diff: ash/default_wallpaper_delegate.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. 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
Index: ash/default_wallpaper_delegate.cc
diff --git a/ash/default_wallpaper_delegate.cc b/ash/default_wallpaper_delegate.cc
index 6139a4d2e3aac4ee3887a50d5312e0c6611dec99..e5f3e1180a70bfec0a8a452f9256479f02949683 100644
--- a/ash/default_wallpaper_delegate.cc
+++ b/ash/default_wallpaper_delegate.cc
@@ -4,8 +4,8 @@
#include "ash/default_wallpaper_delegate.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 "ui/wm/core/window_animations.h"
namespace ash {
@@ -28,7 +28,7 @@ bool DefaultWallpaperDelegate::ShouldShowInitialAnimation() {
void DefaultWallpaperDelegate::UpdateWallpaper(bool clear_cache) {}
void DefaultWallpaperDelegate::InitializeWallpaper() {
- ash::Shell::GetInstance()->wallpaper_controller()->CreateEmptyWallpaper();
+ ash::WmShell::Get()->wallpaper_controller()->CreateEmptyWallpaper();
James Cook 2016/09/07 21:27:05 nit: no ash::
msw 2016/09/07 22:28:24 Done.
}
void DefaultWallpaperDelegate::OpenSetWallpaperPage() {}

Powered by Google App Engine
This is Rietveld 408576698