Supervised users import: make sure users are up-to-date.

chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
@@ skipping 12 matching lines @@
   return host->GetWizardController()->GetLocallyManagedUserCreationScreen();
 }
 
 } // namespace
 
 LocallyManagedUserCreationFlow::LocallyManagedUserCreationFlow(
     const std::string& manager_id)
         : ExtendedUserFlow(manager_id),
         token_validated_(false),
         logged_in_(false),
+        session_started_(false),
         manager_profile_(NULL) {}
 
 LocallyManagedUserCreationFlow::~LocallyManagedUserCreationFlow() {}
 
 bool LocallyManagedUserCreationFlow::CanLockScreen() {
   return false;
 }
 
 bool LocallyManagedUserCreationFlow::ShouldShowSettings() {
   return false;
@@ skipping 13 matching lines @@
     return;
   if (status == User::OAUTH2_TOKEN_STATUS_INVALID) {
     GetScreen(host())->ShowManagerInconsistentStateErrorScreen();
     return;
   }
   DCHECK(status == User::OAUTH2_TOKEN_STATUS_VALID);
   // We expect that LaunchExtraSteps is called by this time (local
   // authentication happens before oauth token validation).
   token_validated_ = true;
 
-  if (token_validated_ && logged_in_)
-    GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+  if (token_validated_ && logged_in_) {
+    if (!session_started_)
+      GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+    session_started_ = true;
+  }
 }
 
 
 bool LocallyManagedUserCreationFlow::HandleLoginFailure(
     const LoginFailure& failure) {
   if (failure.reason() == LoginFailure::COULD_NOT_MOUNT_CRYPTOHOME)
     GetScreen(host())->OnManagerLoginFailure();
   else
     GetScreen(host())->ShowManagerInconsistentStateErrorScreen();
   return true;
 }
 
 void LocallyManagedUserCreationFlow::HandleLoginSuccess(
     const UserContext& context) {}
 
 bool LocallyManagedUserCreationFlow::HandlePasswordChangeDetected() {
   GetScreen(host())->ShowManagerInconsistentStateErrorScreen();
   return true;
 }
 
 void LocallyManagedUserCreationFlow::LaunchExtraSteps(
     Profile* profile) {
   logged_in_ = true;
   manager_profile_ = profile;
   g_browser_process->platform_part()->profile_helper()->ProfileStartup(
       profile,
       true);
 
-  if (token_validated_ && logged_in_)
-    GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
-  else
+  if (token_validated_ && logged_in_) {
+    if (!session_started_)
+      GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+    session_started_ = true;
+  } else {
     GetScreen(host())->OnManagerCryptohomeAuthenticated();
+  }
 }
 
 }  // namespace chromeos