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

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

Issue 378893003: Fix and re-enable "early restart" feature on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« 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 a6b7c488f7afa5e104842e35404a6fe889fda288..f8612bde921f2cb3e849a3e07d50bf7e4d306ad3 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -120,9 +120,9 @@ bool NeedRestartToApplyPerSessionFlags(const CommandLine& user_flags) {
}
bool CanPerformEarlyRestart() {
- // TODO(alemate): crbug/391357 - temporary disabling early restart before
- // crbug.com/391793 is fixed.
- return false;
+ // Desktop build is used for development only. Early restart is not supported.
+ if (!base::SysInfo::IsRunningOnChromeOS())
Nikita (slow) 2014/07/09 04:04:08 FYI we can emulate that at least somehow since Gue
+ return false;
const ExistingUserController* controller =
ExistingUserController::current_controller();
@@ -351,6 +351,9 @@ void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
bool LoginUtilsImpl::RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
bool early_restart) {
+ if (ProfileHelper::IsSigninProfile(profile))
+ return false;
+
if (early_restart && !CanPerformEarlyRestart())
return false;
« 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