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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase Created 3 years, 9 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/chrome_session_manager.h" 5 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/sys_info.h" 12 #include "base/sys_info.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_process_platform_part_chromeos.h" 14 #include "chrome/browser/browser_process_platform_part_chromeos.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" 16 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
17 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 17 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
18 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 18 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
19 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" 19 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
20 #include "chrome/browser/chromeos/boot_times_recorder.h" 20 #include "chrome/browser/chromeos/boot_times_recorder.h"
21 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" 21 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
22 #include "chrome/browser/chromeos/login/login_wizard.h" 22 #include "chrome/browser/chromeos/login/login_wizard.h"
23 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 23 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
24 #include "chrome/browser/chromeos/login/wizard_controller.h" 24 #include "chrome/browser/chromeos/login/wizard_controller.h"
25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/signin/signin_manager_factory.h" 27 #include "chrome/browser/signin/signin_manager_factory.h"
28 #include "chrome/browser/ui/ash/ash_util.h" 28 #include "chrome/browser/ui/ash/ash_util.h"
29 #include "chrome/browser/ui/ash/session_controller_client.h"
James Cook 2017/03/19 19:02:51 nit: not needed
xiyuan 2017/03/20 17:12:56 Done.
29 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
31 #include "chromeos/audio/cras_audio_handler.h" 32 #include "chromeos/audio/cras_audio_handler.h"
32 #include "chromeos/chromeos_switches.h" 33 #include "chromeos/chromeos_switches.h"
33 #include "chromeos/cryptohome/cryptohome_parameters.h" 34 #include "chromeos/cryptohome/cryptohome_parameters.h"
34 #include "chromeos/dbus/dbus_thread_manager.h" 35 #include "chromeos/dbus/dbus_thread_manager.h"
35 #include "chromeos/dbus/session_manager_client.h" 36 #include "chromeos/dbus/session_manager_client.h"
36 #include "components/prefs/pref_service.h" 37 #include "components/prefs/pref_service.h"
37 #include "components/signin/core/account_id/account_id.h" 38 #include "components/signin/core/account_id/account_id.h"
38 #include "components/signin/core/browser/signin_manager.h" 39 #include "components/signin/core/browser/signin_manager.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 const std::string& user_id_hash, 231 const std::string& user_id_hash,
231 bool browser_restart) { 232 bool browser_restart) {
232 BootTimesRecorder* btl = BootTimesRecorder::Get(); 233 BootTimesRecorder* btl = BootTimesRecorder::Get();
233 btl->AddLoginTimeMarker("UserLoggedIn-Start", false); 234 btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
234 session_manager::SessionManager::NotifyUserLoggedIn( 235 session_manager::SessionManager::NotifyUserLoggedIn(
235 user_account_id, user_id_hash, browser_restart); 236 user_account_id, user_id_hash, browser_restart);
236 btl->AddLoginTimeMarker("UserLoggedIn-End", false); 237 btl->AddLoginTimeMarker("UserLoggedIn-End", false);
237 } 238 }
238 239
239 } // namespace chromeos 240 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698