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

Side by Side Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 (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/content/shell_content_state.h" 7 #include "ash/content/shell_content_state.h"
8 #include "ash/multi_profile_uma.h" 8 #include "ash/multi_profile_uma.h"
9 #include "ash/session/session_state_observer.h" 9 #include "ash/session/session_state_observer.h"
10 #include "ash/system/chromeos/multi_user/user_switch_util.h" 10 #include "ash/system/chromeos/multi_user/user_switch_util.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/prefs/pref_service.h"
16 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 15 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
17 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 16 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
18 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 17 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
19 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
20 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 21 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
23 #include "chrome/browser/ui/ash/session_util.h" 22 #include "chrome/browser/ui/ash/session_util.h"
24 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
25 #include "chromeos/chromeos_switches.h" 24 #include "chromeos/chromeos_switches.h"
26 #include "chromeos/dbus/dbus_thread_manager.h" 25 #include "chromeos/dbus/dbus_thread_manager.h"
27 #include "chromeos/dbus/session_manager_client.h" 26 #include "chromeos/dbus/session_manager_client.h"
28 #include "chromeos/login/login_state.h" 27 #include "chromeos/login/login_state.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"
32 #include "components/user_manager/user_manager.h" 32 #include "components/user_manager/user_manager.h"
33 #include "google_apis/gaia/gaia_auth_util.h" 33 #include "google_apis/gaia/gaia_auth_util.h"
34 #include "ui/gfx/image/image_skia.h" 34 #include "ui/gfx/image/image_skia.h"
35 35
36 SessionStateDelegateChromeos::SessionStateDelegateChromeos() 36 SessionStateDelegateChromeos::SessionStateDelegateChromeos()
37 : session_state_(SESSION_STATE_LOGIN_PRIMARY) { 37 : session_state_(SESSION_STATE_LOGIN_PRIMARY) {
38 user_manager::UserManager::Get()->AddSessionStateObserver(this); 38 user_manager::UserManager::Get()->AddSessionStateObserver(this);
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 } 270 }
271 271
272 void DoSwitchUser(const AccountId& account_id) { 272 void DoSwitchUser(const AccountId& account_id) {
273 user_manager::UserManager::Get()->SwitchActiveUser(account_id); 273 user_manager::UserManager::Get()->SwitchActiveUser(account_id);
274 } 274 }
275 275
276 void SessionStateDelegateChromeos::TryToSwitchUser( 276 void SessionStateDelegateChromeos::TryToSwitchUser(
277 const AccountId& account_id) { 277 const AccountId& account_id) {
278 ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id)); 278 ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id));
279 } 279 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698