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

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_util.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/multi_user/multi_user_util.h" 5 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "google_apis/gaia/gaia_auth_util.h" 13 #include "google_apis/gaia/gaia_auth_util.h"
14 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/users/user_manager.h"
17 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 17 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
18 #endif 18 #endif
19 19
20 namespace multi_user_util { 20 namespace multi_user_util {
21 21
22 std::string GetUserIDFromProfile(Profile* profile) { 22 std::string GetUserIDFromProfile(Profile* profile) {
23 return GetUserIDFromEmail(profile->GetOriginalProfile()->GetProfileName()); 23 return GetUserIDFromEmail(profile->GetOriginalProfile()->GetProfileName());
24 } 24 }
25 25
26 std::string GetUserIDFromEmail(const std::string& email) { 26 std::string GetUserIDFromEmail(const std::string& email) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // Move the window to the current user's desktop. 82 // Move the window to the current user's desktop.
83 void MoveWindowToCurrentDesktop(aura::Window* window) { 83 void MoveWindowToCurrentDesktop(aura::Window* window) {
84 #if defined(OS_CHROMEOS) 84 #if defined(OS_CHROMEOS)
85 chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser( 85 chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(
86 window, 86 window,
87 GetCurrentUserId()); 87 GetCurrentUserId());
88 #endif 88 #endif
89 } 89 }
90 90
91 } // namespace multi_user_util 91 } // namespace multi_user_util
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698