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

Unified Diff: chrome/browser/chromeos/policy/device_local_account.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/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 f3a6dc415990d35df5e2020184b8a58193d0a504..b4624780176588fb3ee2da7752636b81d4395fe7 100644
--- a/chrome/browser/chromeos/policy/device_local_account.cc
+++ b/chrome/browser/chromeos/policy/device_local_account.cc
@@ -12,8 +12,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chromeos/login/user_names.h"
#include "chromeos/settings/cros_settings_names.h"
#include "google_apis/gaia/gaia_auth_util.h"
@@ -62,7 +62,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::UserManager::kGuestUserName)
+ if (user_id == chromeos::login::kGuestUserName)
return false;
const std::string domain = gaia::ExtractDomainName(user_id);
if (!EndsWith(domain, kDeviceLocalAccountDomainSuffix, true))

Powered by Google App Engine
This is Rietveld 408576698