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

Unified Diff: chrome/browser/chromeos/login/signin/merge_session_throttle.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/signin/merge_session_throttle.cc
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
index 259e84bddeb2149107e9be5fbdf594378aa49809..1c187de6663a98d4a026725f1439308c77961935 100644
--- a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
@@ -164,9 +164,9 @@ bool MergeSessionThrottle::ShouldDelayRequest(
int render_view_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!chromeos::UserManager::Get()->IsUserLoggedIn()) {
+ if (!chromeos::GetUserManager()->IsUserLoggedIn()) {
return false;
- } else if (!chromeos::UserManager::Get()->IsLoggedInAsRegularUser()) {
+ } else if (!chromeos::GetUserManager()->IsLoggedInAsRegularUser()) {
// This is not a regular user session, let's remove the throttle
// permanently.
if (!AreAllSessionMergedAlready())
@@ -207,8 +207,8 @@ bool MergeSessionThrottle::ShouldDelayRequest(
// In theory this should not happen since we should
// kick off the session restore process for the newly added profile
// before we attempt loading any page.
- if (chromeos::UserManager::Get()->IsLoggedInAsRegularUser() &&
- !chromeos::UserManager::Get()->IsLoggedInAsStub()) {
+ if (chromeos::GetUserManager()->IsLoggedInAsRegularUser() &&
+ !chromeos::GetUserManager()->IsLoggedInAsStub()) {
LOG(WARNING) << "Loading content for a profile without "
<< "session restore?";
}
« no previous file with comments | « chrome/browser/chromeos/login/signin/auth_sync_observer.cc ('k') | chrome/browser/chromeos/login/signin/oauth2_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698