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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 4347001: [ChromeOS] Hardcoded screen lock enabled for google.com users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a bug per zel Created 10 years, 1 month 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index f872733a2a42f7fe2e2f214dba7df7a5da9deb90..d75f228e4c526fbd03b34089fcb36d9116cd0da4 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -51,7 +51,6 @@ namespace chromeos {
namespace {
-
// Prefix for Auth token received from ClientLogin request.
const char kAuthPrefix[] = "Auth=";
// Suffix for Auth token received from ClientLogin request.
@@ -239,6 +238,16 @@ void LoginUtilsImpl::CompleteLogin(
btl->AddLoginTimeMarker("IMESTarted", false);
}
}
+
+ // We suck. This is a hack since we do not have the enterprise feature
+ // done yet to pull down policies from the domain admin. We'll take this
+ // out when we get that done properly.
+ // TODO(xiyuan): Remove this once enterprise feature is ready.
+ if (EndsWith(username, "@google.com", true)) {
+ PrefService* pref_service = profile->GetPrefs();
+ pref_service->SetBoolean(prefs::kEnableScreenLock, true);
+ }
+
DoBrowserLaunch(profile);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698