OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/ui/ash/session_state_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
6 | 6 |
7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/session/session_state_observer.h" | 8 #include "ash/common/session/session_state_observer.h" |
9 #include "ash/content/shell_content_state.h" | 9 #include "ash/content/shell_content_state.h" |
10 #include "ash/system/chromeos/multi_user/user_switch_util.h" | |
11 #include "base/bind.h" | 10 #include "base/bind.h" |
12 #include "base/callback.h" | 11 #include "base/callback.h" |
13 #include "base/command_line.h" | 12 #include "base/command_line.h" |
14 #include "base/logging.h" | 13 #include "base/logging.h" |
15 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 14 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
16 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 15 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
17 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 16 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
18 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 17 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
19 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
21 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 20 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
| 21 #include "chrome/browser/ui/ash/multi_user/user_switch_util.h" |
22 #include "chrome/browser/ui/ash/session_util.h" | 22 #include "chrome/browser/ui/ash/session_util.h" |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
24 #include "chromeos/chromeos_switches.h" | 24 #include "chromeos/chromeos_switches.h" |
25 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
26 #include "chromeos/dbus/session_manager_client.h" | 26 #include "chromeos/dbus/session_manager_client.h" |
27 #include "chromeos/login/login_state.h" | 27 #include "chromeos/login/login_state.h" |
28 #include "components/prefs/pref_service.h" | 28 #include "components/prefs/pref_service.h" |
29 #include "components/signin/core/account_id/account_id.h" | 29 #include "components/signin/core/account_id/account_id.h" |
30 #include "components/user_manager/user.h" | 30 #include "components/user_manager/user.h" |
31 #include "components/user_manager/user_info.h" | 31 #include "components/user_manager/user_info.h" |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 session_state_observer_list_, | 269 session_state_observer_list_, |
270 SessionStateChanged(session_state_)); | 270 SessionStateChanged(session_state_)); |
271 } | 271 } |
272 | 272 |
273 void DoSwitchUser(const AccountId& account_id) { | 273 void DoSwitchUser(const AccountId& account_id) { |
274 user_manager::UserManager::Get()->SwitchActiveUser(account_id); | 274 user_manager::UserManager::Get()->SwitchActiveUser(account_id); |
275 } | 275 } |
276 | 276 |
277 void SessionStateDelegateChromeos::TryToSwitchUser( | 277 void SessionStateDelegateChromeos::TryToSwitchUser( |
278 const AccountId& account_id) { | 278 const AccountId& account_id) { |
279 ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id)); | 279 TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id)); |
280 } | 280 } |
OLD | NEW |