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

Unified Diff: chrome/browser/chromeos/login/users/user_manager.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/chromeos/login/users/user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager.cc b/chrome/browser/chromeos/login/users/user_manager.cc
index ccac4b1f0cfee1f6bc0d15917af75713738a3ab3..21f804290f620ff8a0ee17ba846c71283cfb5041 100644
--- a/chrome/browser/chromeos/login/users/user_manager.cc
+++ b/chrome/browser/chromeos/login/users/user_manager.cc
@@ -6,10 +6,8 @@
#include "base/command_line.h"
#include "base/prefs/pref_registry_simple.h"
-#include "chrome/browser/browser_process_platform_part_chromeos.h"
#include "chrome/browser/chromeos/login/users/user_manager_impl.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/common/chrome_switches.h"
namespace chromeos {
@@ -109,7 +107,7 @@ ScopedUserManagerEnabler::ScopedUserManagerEnabler(UserManager* user_manager)
}
ScopedUserManagerEnabler::~ScopedUserManagerEnabler() {
- UserManager::Get()->Shutdown();
+ GetUserManager()->Shutdown();
UserManager::Destroy();
UserManager::SetForTesting(previous_user_manager_);
}
@@ -122,8 +120,14 @@ ScopedTestUserManager::ScopedTestUserManager() {
}
ScopedTestUserManager::~ScopedTestUserManager() {
- UserManager::Get()->Shutdown();
+ GetUserManager()->Shutdown();
UserManager::Destroy();
}
+UserManager* GetUserManager() {
+ // TODO(nkostylev): Once UserManager is moved to user_manager component switch
+ // this to something line g_browser_process->platform_part()->user_manager().
+ return UserManager::Get();
+}
+
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/users/user_manager.h ('k') | chrome/browser/chromeos/login/users/user_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698