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

Unified Diff: chrome/browser/chromeos/login/ui/user_adding_screen.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/ui/user_adding_screen.cc
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
index 8547d7bb4513aa60c58ff0dd3aef3dd81e0e681e..e74b07214f9c33a6a9853aed06a1d1c4f2af3907 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "components/session_manager/core/session_manager.h"
+#include "components/user_manager/user_manager.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
@@ -64,9 +65,9 @@ void UserAddingScreenImpl::Cancel() {
display_host_->Finalize();
// Reset wallpaper if cancel adding user from multiple user sign in page.
- if (UserManager::Get()->IsUserLoggedIn()) {
+ if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
WallpaperManager::Get()->SetUserWallpaperDelayed(
- UserManager::Get()->GetActiveUser()->email());
+ user_manager::UserManager::Get()->GetActiveUser()->email());
}
}

Powered by Google App Engine
This is Rietveld 408576698