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

Unified Diff: ash/test/test_wallpaper_delegate.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. 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
« no previous file with comments | « ash/test/test_session_state_animator.cc ('k') | ash/touch/touch_uma.cc » ('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 54fb7cec5ef485d0f4464bc623a0f321ccbc45c3..5b668be1228f73143f5ec833944de76c20b0c112 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/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.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()->desktop_background_controller()->SetWallpaperImage(
+ Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(
custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH);
}
update_wallpaper_count_++;
« no previous file with comments | « ash/test/test_session_state_animator.cc ('k') | ash/touch/touch_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698