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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

Issue 2661283002: cros: Clean up SessionStateDelegate refs in Chrome (Closed)
Patch Set: update browser_finder_chromeos_unittest Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
index 81163693645b1fd73cf979a3de7a407d88205fdb..7f5b97b1927926082dba21480a3810ab06f4ee80 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "ash/common/multi_profile_uma.h"
-#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wm_shell.h"
#include "base/logging.h"
@@ -14,6 +13,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user_info.h"
+#include "components/user_manager/user_manager.h"
namespace {
chrome::MultiUserWindowManager* g_instance = NULL;
@@ -40,9 +40,8 @@ MultiUserWindowManager* MultiUserWindowManager::CreateInstance() {
if (ash::WmShell::Get()->delegate()->IsMultiProfilesEnabled()) {
if (!g_instance) {
MultiUserWindowManagerChromeOS* manager =
- new MultiUserWindowManagerChromeOS(ash::WmShell::Get()
- ->GetSessionStateDelegate()
- ->GetUserInfo(0)
+ new MultiUserWindowManagerChromeOS(user_manager::UserManager::Get()
+ ->GetActiveUser()
->GetAccountId());
g_instance = manager;
manager->Init();

Powered by Google App Engine
This is Rietveld 408576698