Special check on Supervised User creation flow added to prevent misleading shelf alignment.

chrome/browser/ui/ash/session_state_delegate_chromeos.cc

 // Copyright (c) 2013 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/ui/ash/session_state_delegate_chromeos.h"
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session/session_state_observer.h"
 #include "ash/system/chromeos/multi_user/user_switch_util.h"
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 SessionStateDelegateChromeos::SessionStateDelegateChromeos()
-    : session_state_(SESSION_STATE_LOGIN_PRIMARY) {
+    : session_state_(SESSION_STATE_LOGIN_PRIMARY),
+      is_in_supervised_creation_flow_(false) {
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
   chromeos::UserAddingScreen::Get()->AddObserver(this);
 
   // LoginState is not initialized in unit_tests.
   if (chromeos::LoginState::IsInitialized()) {
     chromeos::LoginState::Get()->AddObserver(this);
     SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn() ?
         SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY, true);
   }
 }
@@ skipping 97 matching lines @@
 }
 
 bool SessionStateDelegateChromeos::IsUserSessionBlocked() const {
   bool has_login_manager = CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kLoginManager);
   return (has_login_manager && !IsActiveUserSessionStarted()) ||
          IsScreenLocked() ||
          chromeos::UserAddingScreen::Get()->IsRunning();
 }
 
+bool SessionStateDelegateChromeos::IsInSupervisedUserCreationFlow() const {
+  return is_in_supervised_creation_flow_;
+}
+
+void SessionStateDelegateChromeos::SetIsInSupervisedUserCreationFlow(
+    bool is_in_flow) {
+  is_in_supervised_creation_flow_ = is_in_flow;
+}
+
 ash::SessionStateDelegate::SessionState
 SessionStateDelegateChromeos::GetSessionState() const {
   return session_state_;
 }
 
 const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo(
     ash::MultiProfileIndex index) const {
   DCHECK_LT(index, NumberOfLoggedInUsers());
   return user_manager::UserManager::Get()->GetLRULoggedInUsers()[index];
 }
@@ skipping 124 matching lines @@
 }
 
 void DoSwitchUser(const std::string& user_id) {
   user_manager::UserManager::Get()->SwitchActiveUser(user_id);
 }
 
 void SessionStateDelegateChromeos::TryToSwitchUser(
     const std::string& user_id) {
   ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, user_id));
 }