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

Unified Diff: chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.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/wm/system_wallpaper_controller.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc
diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc
index 5d2b823c906b939366f54e578ad11169fbe6d75d..49d6b5163a0e717f65d82de6dc27830bb5e86274 100644
--- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc
+++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc
@@ -6,8 +6,8 @@
#include <vector>
-#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.h"
#include "base/command_line.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
@@ -228,7 +228,7 @@ class CustomizationWallpaperDownloaderBrowserTest
~CustomizationWallpaperDownloaderBrowserTest() override {}
void SetUpOnMainThread() override {
- controller_ = ash::Shell::GetInstance()->desktop_background_controller();
+ controller_ = ash::Shell::GetInstance()->wallpaper_controller();
local_state_ = g_browser_process->local_state();
}
@@ -247,7 +247,7 @@ class CustomizationWallpaperDownloaderBrowserTest
*cmdline_wallpaper_dir_, &wallpaper_manager_command_line_);
}
- ash::DesktopBackgroundController* controller_;
+ ash::WallpaperController* controller_;
PrefService* local_state_;
std::unique_ptr<base::CommandLine> wallpaper_manager_command_line_;
« no previous file with comments | « ash/wm/system_wallpaper_controller.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698