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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 9854017: Canonicalize enterprise registration user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
index 6bf4a25d38066f0f30ff89aec2062900aa763b82..16663bbd52c59ec530fe6f8915e1f0ac8d1a5453 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/screen_observer.h"
#include "chrome/browser/policy/auto_enrollment_client.h"
#include "chrome/browser/policy/browser_policy_connector.h"
@@ -52,7 +53,7 @@ EnterpriseEnrollmentScreen::~EnterpriseEnrollmentScreen() {}
void EnterpriseEnrollmentScreen::SetParameters(bool is_auto_enrollment,
const std::string& user) {
is_auto_enrollment_ = is_auto_enrollment;
- user_ = user;
+ user_ = user.empty() ? user : Authenticator::Canonicalize(user);
}
void EnterpriseEnrollmentScreen::PrepareToShow() {
@@ -72,7 +73,7 @@ void EnterpriseEnrollmentScreen::Hide() {
void EnterpriseEnrollmentScreen::OnOAuthTokenAvailable(
const std::string& user,
const std::string& token) {
- user_ = user;
+ user_ = Authenticator::Canonicalize(user);
RegisterForDevicePolicy(token);
}
« no previous file with comments | « no previous file | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698