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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 672800271879b4cac856b2105e0e75183d3693b0..6d09eba702be4195cb562eb570c7673df99fd8ed 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -9,9 +9,7 @@
#include <algorithm>
#include <vector>
-#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/chromeos/devicetype_utils.h"
-#include "ash/common/wm_shell.h"
#include "ash/public/interfaces/constants.mojom.h"
#include "ash/shell.h"
#include "ash/wm/lock_state_controller.h"
@@ -63,6 +61,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/signin/easy_unlock_service.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
@@ -1443,8 +1442,7 @@ void SigninScreenHandler::HandleFocusPod(const AccountId& account_id) {
user_manager::UserManager::Get()->FindUser(account_id);
// |user| may be nullptr in kiosk mode or unit tests.
if (user && user->is_logged_in() && !user->is_active()) {
- ash::WmShell::Get()->GetSessionStateDelegate()->SwitchActiveUser(
- account_id);
+ SessionControllerClient::DoSwitchActiveUser(account_id);
} else {
SetUserInputMethod(account_id.GetUserEmail(), ime_state_.get());
SetKeyboardSettings(account_id);

Powered by Google App Engine
This is Rietveld 408576698