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

Unified Diff: chrome/browser/chromeos/login/users/user.cc

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in one more 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.cc
diff --git a/chrome/browser/chromeos/login/users/user.cc b/chrome/browser/chromeos/login/users/user.cc
index 6968f8c6b343faad7402a79e7dc67401ceb7392e..4fd8b3d1292489cdb552d337b719d103e0e7445c 100644
--- a/chrome/browser/chromeos/login/users/user.cc
+++ b/chrome/browser/chromeos/login/users/user.cc
@@ -10,6 +10,7 @@
#include "base/threading/thread_restrictions.h"
#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chromeos/login/user_names.h"
#include "google_apis/gaia/gaia_auth_util.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -244,7 +245,7 @@ bool RegularUser::CanSyncImage() const {
return true;
}
-GuestUser::GuestUser() : User(UserManager::kGuestUserName) {
+GuestUser::GuestUser() : User(chromeos::login::kGuestUserName) {
set_display_email(std::string());
}
@@ -280,7 +281,7 @@ std::string LocallyManagedUser::display_email() const {
return base::UTF16ToUTF8(display_name());
}
-RetailModeUser::RetailModeUser() : User(UserManager::kRetailModeUserName) {
+RetailModeUser::RetailModeUser() : User(chromeos::login::kRetailModeUserName) {
set_display_email(std::string());
}

Powered by Google App Engine
This is Rietveld 408576698