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

Unified Diff: chrome/browser/chromeos/policy/device_local_account.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Removed unused #includes Created 4 years, 2 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/policy/device_local_account.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc
index 92e791fee4fae33f4c069e29f3f7687ed487ffef..dd16b9022729f4637e8fb9b3cd3b2cbd29885ae0 100644
--- a/chrome/browser/chromeos/policy/device_local_account.cc
+++ b/chrome/browser/chromeos/policy/device_local_account.cc
@@ -17,9 +17,9 @@
#include "base/values.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chromeos/login/user_names.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_names.h"
#include "google_apis/gaia/gaia_auth_util.h"
namespace policy {
@@ -76,7 +76,7 @@ bool IsDeviceLocalAccountUser(const std::string& user_id,
DeviceLocalAccount::Type* type) {
// For historical reasons, the guest user ID does not contain an @ symbol and
// therefore, cannot be parsed by gaia::ExtractDomainName().
- if (user_id == chromeos::login::GuestAccountId().GetUserEmail())
+ if (user_id == user_manager::GuestAccountId().GetUserEmail())
return false;
const std::string domain = gaia::ExtractDomainName(user_id);
if (!base::EndsWith(domain, kDeviceLocalAccountDomainSuffix,

Powered by Google App Engine
This is Rietveld 408576698