| OLD | NEW |
| 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 "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
| 12 #include "google_apis/gaia/gaia_auth_util.h" | 13 #include "google_apis/gaia/gaia_auth_util.h" |
| 13 | 14 |
| 14 #if defined(OS_CHROMEOS) | 15 #if defined(OS_CHROMEOS) |
| 15 #include "chrome/browser/chromeos/login/user_manager.h" | 16 #include "chrome/browser/chromeos/login/user_manager.h" |
| 16 #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" |
| 17 #endif | 18 #endif |
| 18 | 19 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #if defined(OS_CHROMEOS) | 64 #if defined(OS_CHROMEOS) |
| 64 return GetUserIDFromProfile(profile) == | 65 return GetUserIDFromProfile(profile) == |
| 65 chromeos::UserManager::Get()->GetActiveUser()->email(); | 66 chromeos::UserManager::Get()->GetActiveUser()->email(); |
| 66 #else | 67 #else |
| 67 // In non Chrome OS configurations this will be always true since this only | 68 // In non Chrome OS configurations this will be always true since this only |
| 68 // makes sense in separate desktop mode. | 69 // makes sense in separate desktop mode. |
| 69 return true; | 70 return true; |
| 70 #endif | 71 #endif |
| 71 } | 72 } |
| 72 | 73 |
| 74 const std::string& GetCurrentUserId() { |
| 75 #if defined(OS_CHROMEOS) |
| 76 return chromeos::UserManager::Get()->GetActiveUser()->email(); |
| 77 #else |
| 78 return base::EmptyString(); |
| 79 #endif |
| 80 } |
| 81 |
| 82 // Move the window to the current user's desktop. |
| 83 void MoveWindowToCurrentDesktop(aura::Window* window) { |
| 84 #if defined(OS_CHROMEOS) |
| 85 chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser( |
| 86 window, |
| 87 GetCurrentUserId()); |
| 88 #endif |
| 89 } |
| 90 |
| 73 } // namespace multi_user_util | 91 } // namespace multi_user_util |
| OLD | NEW |