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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 1bf5871a82c1f1391d2a1402daa0e2342528b4b6..1c8b8690c77d2cf80f45aa3c7f9e64fe3ebb6873 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -55,9 +55,9 @@ bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
if (!chromeos::UserManager::IsInitialized())
return false;
size_t admitted_users_to_be_added =
- chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile().size();
+ chromeos::GetUserManager()->GetUsersAdmittedForMultiProfile().size();
size_t logged_in_users =
- chromeos::UserManager::Get()->GetLoggedInUsers().size();
+ chromeos::GetUserManager()->GetLoggedInUsers().size();
if (!logged_in_users) {
// The shelf gets created on the login screen and as such we have to create
// all multi profile items of the the system tray menu before the user logs
@@ -99,7 +99,7 @@ void ChromeShellDelegate::Exit() {
content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {
#if defined(OS_CHROMEOS)
- DCHECK(chromeos::UserManager::Get()->GetLoggedInUsers().size());
+ DCHECK(chromeos::GetUserManager()->GetLoggedInUsers().size());
#endif
return ProfileManager::GetActiveUserProfile();
}
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698