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

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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
Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index 4818e069abe1660f443b9eb19cd8e2b66d013223..31185f160f98ba70e6d071e3e60e25dfd5adea29 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -6,8 +6,8 @@
#include "ash/common/shelf/shelf.h"
#include "ash/common/shelf/wm_shelf.h"
-#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.h"
#include "base/rand_util.h"
#include "base/values.h"
#include "chrome/browser/chromeos/camera_detector.h"
@@ -372,10 +372,9 @@ void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(
->NotifySupervisedUserCreationStarted();
manager_signin_in_progress_ = false;
DCHECK(controller_.get());
- // For manager user, move desktop to locked container so that windows created
- // during the user image picker step are below it.
- ash::Shell::GetInstance()->
- desktop_background_controller()->MoveDesktopToLockedContainer();
+ // For manager user, move wallpaper to locked container so that windows
+ // created during the user image picker step are below it.
+ ash::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer();
ash::Shelf::ForPrimaryDisplay()->wm_shelf()->SetAlignment(
ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698