Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / supervised / supervised_user_login_flow.cc

diff --git a/src/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc b/src/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc
index 4351e54..bbb7e37 100644 (file)
--- a/src/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc
+++ b/src/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h"
 
 #include "base/base64.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
@@ -18,6 +19,7 @@
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/common/chrome_switches.h"
 #include "chromeos/login/auth/key.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ -35,6 +37,14 @@ SupervisedUserLoginFlow::SupervisedUserLoginFlow(
 
 SupervisedUserLoginFlow::~SupervisedUserLoginFlow() {}
 
+void SupervisedUserLoginFlow::AppendAdditionalCommandLineSwitches() {
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+  if (user_manager->IsCurrentUserNew()) {
+    // Supervised users should launch into empty desktop on first run.
+    CommandLine::ForCurrentProcess()->AppendSwitch(::switches::kSilentLaunch);
+  }
+}
+
 bool SupervisedUserLoginFlow::CanLockScreen() {
   return true;
 }
@@ -59,10 +69,6 @@ bool SupervisedUserLoginFlow::HandlePasswordChangeDetected() {
   return false;
 }
 
-void SupervisedUserLoginFlow::HandleOAuthTokenStatusChange(
-    user_manager::User::OAuthTokenStatus status) {
-}
-
 void SupervisedUserLoginFlow::OnSyncSetupDataLoaded(
     const std::string& token) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));