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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: achuithb@ comments Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback, 1279 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback,
1280 weak_factory_.GetWeakPtr(), profile)); 1280 weak_factory_.GetWeakPtr(), profile));
1281 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 1281 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
1282 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving, 1282 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving,
1283 weak_factory_.GetWeakPtr(), profile), 1283 weak_factory_.GetWeakPtr(), profile),
1284 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs)); 1284 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs));
1285 1285
1286 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 1286 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
1287 1287
1288 // Kiosk apps has their own session initialization pipeline. 1288 // Kiosk apps has their own session initialization pipeline.
1289 if (user_manager->IsLoggedInAsKioskApp()) 1289 if (user_manager->IsLoggedInAsKioskApp() ||
1290 user_manager->IsLoggedInAsArcKioskApp()) {
1290 return false; 1291 return false;
1292 }
1291 1293
1292 if (start_session_type_ == PRIMARY_USER_SESSION) { 1294 if (start_session_type_ == PRIMARY_USER_SESSION) {
1293 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); 1295 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow();
1294 WizardController* oobe_controller = WizardController::default_controller(); 1296 WizardController* oobe_controller = WizardController::default_controller();
1295 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); 1297 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
1296 bool skip_post_login_screens = 1298 bool skip_post_login_screens =
1297 user_flow->ShouldSkipPostLoginScreens() || 1299 user_flow->ShouldSkipPostLoginScreens() ||
1298 (oobe_controller && oobe_controller->skip_post_login_screens()) || 1300 (oobe_controller && oobe_controller->skip_post_login_screens()) ||
1299 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); 1301 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin);
1300 1302
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 ->browser_policy_connector_chromeos() 1888 ->browser_policy_connector_chromeos()
1887 ->IsEnterpriseManaged()) { 1889 ->IsEnterpriseManaged()) {
1888 return false; 1890 return false;
1889 } 1891 }
1890 1892
1891 // Do not show end of life notification if this is a guest session 1893 // Do not show end of life notification if this is a guest session
1892 return !profile->IsGuestSession(); 1894 return !profile->IsGuestSession();
1893 } 1895 }
1894 1896
1895 } // namespace chromeos 1897 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698