Don't allow restarting to apply custom flags when supervised user cre…

…ation flow is active BUG=422918 Review URL: https://codereview.chromium.org/654173005 Cr-Commit-Position: refs/heads/master@{#299881}
crosswalk-project · Oct 16, 2014 · dcf3361 · dcf3361
1 parent f21db96
commit dcf3361
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
@@ -147,6 +147,11 @@ bool CanPerformEarlyRestart() {
   if (!base::SysInfo::IsRunningOnChromeOS())
     return false;
 
+  if (!ChromeUserManager::Get()->GetCurrentUserFlow()->
+          SupportsEarlyRestartToApplyFlags()) {
+    return false;
+  }
+
   const ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller)
@@ -399,7 +404,7 @@ bool LoginUtilsImpl::RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
   CommandLine::StringVector flags;
   // argv[0] is the program name |CommandLine::NO_PROGRAM|.
   flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
-  VLOG(1) << "Restarting to apply per-session flags...";
+  LOG(WARNING) << "Restarting to apply per-session flags...";
   DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
       user_manager::UserManager::Get()->GetActiveUser()->email(), flags);
   AttemptRestart(profile);

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc
@@ -52,6 +52,10 @@ bool SupervisedUserCreationFlow::ShouldSkipPostLoginScreens() {
   return true;
 }
 
+bool SupervisedUserCreationFlow::SupportsEarlyRestartToApplyFlags() {
+  return false;
+}
+
 void SupervisedUserCreationFlow::HandleOAuthTokenStatusChange(
     user_manager::User::OAuthTokenStatus status) {
   if (status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN)

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h
@@ -25,6 +25,7 @@ class SupervisedUserCreationFlow : public ExtendedUserFlow {
   virtual bool ShouldShowSettings() override;
   virtual bool ShouldLaunchBrowser() override;
   virtual bool ShouldSkipPostLoginScreens() override;
+  virtual bool SupportsEarlyRestartToApplyFlags() override;
   virtual bool HandleLoginFailure(const AuthFailure& failure) override;
   virtual void HandleLoginSuccess(const UserContext& context) override;
   virtual bool HandlePasswordChangeDetected() override;

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc
@@ -47,6 +47,10 @@ bool SupervisedUserLoginFlow::ShouldSkipPostLoginScreens() {
   return true;
 }
 
+bool SupervisedUserLoginFlow::SupportsEarlyRestartToApplyFlags() {
+  return false;
+}
+
 bool SupervisedUserLoginFlow::HandleLoginFailure(const AuthFailure& failure) {
   return false;
 }

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h
@@ -27,6 +27,7 @@ class SupervisedUserLoginFlow
   virtual bool CanLockScreen() override;
   virtual bool ShouldLaunchBrowser() override;
   virtual bool ShouldSkipPostLoginScreens() override;
+  virtual bool SupportsEarlyRestartToApplyFlags() override;
   virtual bool HandleLoginFailure(const AuthFailure& failure) override;
   virtual void HandleLoginSuccess(const UserContext& context) override;
   virtual bool HandlePasswordChangeDetected() override;

diff --git a/chrome/browser/chromeos/login/user_flow.cc b/chrome/browser/chromeos/login/user_flow.cc
@@ -40,6 +40,10 @@ bool DefaultUserFlow::ShouldSkipPostLoginScreens() {
   return false;
 }
 
+bool DefaultUserFlow::SupportsEarlyRestartToApplyFlags() {
+  return true;
+}
+
 bool DefaultUserFlow::HandleLoginFailure(const AuthFailure& failure) {
   return false;
 }

diff --git a/chrome/browser/chromeos/login/user_flow.h b/chrome/browser/chromeos/login/user_flow.h
@@ -26,6 +26,7 @@ class UserFlow {
   virtual bool ShouldShowSettings() = 0;
   virtual bool ShouldLaunchBrowser() = 0;
   virtual bool ShouldSkipPostLoginScreens() = 0;
+  virtual bool SupportsEarlyRestartToApplyFlags() = 0;
   virtual bool HandleLoginFailure(const AuthFailure& failure) = 0;
   virtual void HandleLoginSuccess(const UserContext& context) = 0;
   virtual bool HandlePasswordChangeDetected() = 0;
@@ -54,6 +55,7 @@ class DefaultUserFlow : public UserFlow {
   virtual bool ShouldShowSettings() override;
   virtual bool ShouldLaunchBrowser() override;
   virtual bool ShouldSkipPostLoginScreens() override;
+  virtual bool SupportsEarlyRestartToApplyFlags() override;
   virtual bool HandleLoginFailure(const AuthFailure& failure) override;
   virtual void HandleLoginSuccess(const UserContext& context) override;
   virtual bool HandlePasswordChangeDetected() override;