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

Unified Diff: chrome/browser/sync/sync_ui_util.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/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 3a15e24fdd117b1ea829a2075ecd05ad9fd77fd3..8143ca3110e781d14a71756bcd45e172c4d7cea2 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -37,7 +37,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user_manager.h"
#endif // defined(OS_CHROMEOS)
typedef GoogleServiceAuthError AuthError;
@@ -55,11 +55,11 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
std::string user_display_name = signin.GetAuthenticatedUsername();
#if defined(OS_CHROMEOS)
- if (chromeos::UserManager::IsInitialized()) {
+ if (user_manager::UserManager::IsInitialized()) {
// On CrOS user email is sanitized and then passed to the signin manager.
// Original email (containing dots) is stored as "display email".
- user_display_name = chromeos::UserManager::Get()->
- GetUserDisplayEmail(user_display_name);
+ user_display_name = user_manager::UserManager::Get()->GetUserDisplayEmail(
+ user_display_name);
}
#endif // defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698