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

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

Issue 2126963002: mash: Move multi_profile_uma.* to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 5 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/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/multi_profile_uma.h"
11 #include "ash/system/chromeos/multi_user/user_switch_util.h" 10 #include "ash/system/chromeos/multi_user/user_switch_util.h"
12 #include "base/bind.h" 11 #include "base/bind.h"
13 #include "base/callback.h" 12 #include "base/callback.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/logging.h" 14 #include "base/logging.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"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 } 271 }
273 272
274 void DoSwitchUser(const AccountId& account_id) { 273 void DoSwitchUser(const AccountId& account_id) {
275 user_manager::UserManager::Get()->SwitchActiveUser(account_id); 274 user_manager::UserManager::Get()->SwitchActiveUser(account_id);
276 } 275 }
277 276
278 void SessionStateDelegateChromeos::TryToSwitchUser( 277 void SessionStateDelegateChromeos::TryToSwitchUser(
279 const AccountId& account_id) { 278 const AccountId& account_id) {
280 ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id)); 279 ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id));
281 } 280 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698