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

Unified Diff: chrome/browser/signin/signin_error_notifier_ash.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/signin/signin_error_notifier_ash.cc
diff --git a/chrome/browser/signin/signin_error_notifier_ash.cc b/chrome/browser/signin/signin_error_notifier_ash.cc
index aae8e7ca5d1d69f4a651a30c812e19203ebc3188..9713889b74116544e650cfc46cf5e1595bd232df 100644
--- a/chrome/browser/signin/signin_error_notifier_ash.cc
+++ b/chrome/browser/signin/signin_error_notifier_ash.cc
@@ -35,7 +35,8 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
+#include "components/user_manager/user_manager.h"
#endif
namespace {
@@ -168,9 +169,9 @@ void SigninErrorNotifier::OnErrorChanged() {
}
#if defined(OS_CHROMEOS)
- if (chromeos::UserManager::IsInitialized()) {
+ if (user_manager::UserManager::IsInitialized()) {
chromeos::UserFlow* user_flow =
- chromeos::UserManager::Get()->GetCurrentUserFlow();
+ chromeos::ChromeUserManager::Get()->GetCurrentUserFlow();
// Check whether Chrome OS user flow allows launching browser.
// Example: Supervised user creation flow which handles token invalidation

Powered by Google App Engine
This is Rietveld 408576698