chrome/browser/chromeos/login/session/chrome_session_manager.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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 | Annotate | Revision Log

« chrome/browser/chromeos/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/screens/user_selection_screen.cc ('k') | chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/chrome_session_manager.h"	5 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/sys_info.h"	10 #include "base/sys_info.h"

11 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"	11 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"

12 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"	12 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

13 #include "chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_mana ger_delegate.h"	13 #include "chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_mana ger_delegate.h"

14 #include "chrome/browser/chromeos/login/session/login_oobe_session_manager_deleg ate.h"	14 #include "chrome/browser/chromeos/login/session/login_oobe_session_manager_deleg ate.h"

15 #include "chrome/browser/chromeos/login/session/restore_after_crash_session_mana ger_delegate.h"	15 #include "chrome/browser/chromeos/login/session/restore_after_crash_session_mana ger_delegate.h"

16 #include "chrome/browser/chromeos/login/session/stub_login_session_manager_deleg ate.h"	16 #include "chrome/browser/chromeos/login/session/stub_login_session_manager_deleg ate.h"

17 #include "chrome/browser/chromeos/login/users/user_manager.h"

18 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

19 #include "chromeos/chromeos_switches.h"	18 #include "chromeos/chromeos_switches.h"

20 #include "chromeos/login/user_names.h"	19 #include "chromeos/login/user_names.h"

	20 #include "components/user_manager/user_manager.h"

21	21

22 namespace chromeos {	22 namespace chromeos {

23	23

24 namespace {	24 namespace {

25	25

26 bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) {	26 bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) {

27 KioskAppManager* app_manager = KioskAppManager::Get();	27 KioskAppManager* app_manager = KioskAppManager::Get();

28 return command_line.HasSwitch(switches::kLoginManager) &&	28 return command_line.HasSwitch(switches::kLoginManager) &&

29 !command_line.HasSwitch(switches::kForceLoginManagerInTests) &&	29 !command_line.HasSwitch(switches::kForceLoginManagerInTests) &&

30 app_manager->IsAutoLaunchEnabled() &&	30 app_manager->IsAutoLaunchEnabled() &&

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 ChromeSessionManager::ChromeSessionManager(	78 ChromeSessionManager::ChromeSessionManager(

79 session_manager::SessionManagerDelegate* delegate) {	79 session_manager::SessionManagerDelegate* delegate) {

80 Initialize(delegate);	80 Initialize(delegate);

81 }	81 }

82	82

83 ChromeSessionManager::~ChromeSessionManager() {	83 ChromeSessionManager::~ChromeSessionManager() {

84 }	84 }

85	85

86 } // namespace chromeos	86 } // namespace chromeos

OLD	NEW