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

Unified Diff: ash/test/test_wallpaper_delegate.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/sysui/wallpaper_delegate_mus.cc ('k') | ash/wallpaper/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_wallpaper_delegate.cc
diff --git a/ash/test/test_wallpaper_delegate.cc b/ash/test/test_wallpaper_delegate.cc
index 5b668be1228f73143f5ec833944de76c20b0c112..16279be13a161ccf25580533c8d275b0ef423631 100644
--- a/ash/test/test_wallpaper_delegate.cc
+++ b/ash/test/test_wallpaper_delegate.cc
@@ -4,8 +4,8 @@
#include "ash/test/test_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"
namespace ash {
namespace test {
@@ -17,7 +17,7 @@ TestWallpaperDelegate::~TestWallpaperDelegate() {}
void TestWallpaperDelegate::UpdateWallpaper(bool clear_cache) {
DefaultWallpaperDelegate::UpdateWallpaper(clear_cache);
if (!custom_wallpaper_.isNull()) {
- Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(
+ WmShell::Get()->wallpaper_controller()->SetWallpaperImage(
custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH);
}
update_wallpaper_count_++;
« no previous file with comments | « ash/sysui/wallpaper_delegate_mus.cc ('k') | ash/wallpaper/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698