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

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2653823004: Do not restart Chrome to apply user flags with stub session manager (Closed)
Patch Set: .\ Created 3 years, 11 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/chromeos/settings/device_settings_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index df305cb67d15e27f0988e08a618c89669d0e7a5f..fe16fe3ab9274e7c0633d98897f129067ed9759a 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -296,10 +296,6 @@ bool NeedRestartToApplyPerSessionFlags(
}
bool CanPerformEarlyRestart() {
- // Desktop build is used for development only. Early restart is not supported.
- if (!base::SysInfo::IsRunningOnChromeOS())
- return false;
-
if (!ChromeUserManager::Get()
->GetCurrentUserFlow()
->SupportsEarlyRestartToApplyFlags()) {
@@ -720,6 +716,11 @@ bool UserSessionManager::RespectLocalePreference(
bool UserSessionManager::RestartToApplyPerSessionFlagsIfNeed(
Profile* profile,
bool early_restart) {
+ SessionManagerClient* session_manager_client =
+ DBusThreadManager::Get()->GetSessionManagerClient();
+ if (!session_manager_client->SupportsRestartToApplyUserFlags())
+ return false;
+
if (ProfileHelper::IsSigninProfile(profile))
return false;
@@ -756,7 +757,7 @@ bool UserSessionManager::RestartToApplyPerSessionFlagsIfNeed(
// argv[0] is the program name |base::CommandLine::NO_PROGRAM|.
flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
LOG(WARNING) << "Restarting to apply per-session flags...";
- DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
+ session_manager_client->SetFlagsForUser(
cryptohome::Identification(
user_manager::UserManager::Get()->GetActiveUser()->GetAccountId()),
flags);
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698