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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 4ab0786fb6192d500de4781778d3a0097fbe26df..70f4df8c38265b2a78c1b1c841ca0317840acaab 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -51,6 +51,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/signin/proximity_auth_facade.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"
@@ -294,8 +295,8 @@ SigninScreenHandler::~SigninScreenHandler() {
max_mode_delegate_->RemoveObserver(this);
max_mode_delegate_.reset(NULL);
}
- ScreenlockBridge::Get()->SetLockHandler(NULL);
- ScreenlockBridge::Get()->SetFocusedUser("");
+ GetScreenlockBridgeInstance()->SetLockHandler(NULL);
+ GetScreenlockBridgeInstance()->SetFocusedUser("");
}
// static
@@ -1256,7 +1257,7 @@ void SigninScreenHandler::HandleUpdateOfflineLogin(bool offline_login_active) {
void SigninScreenHandler::HandleFocusPod(const std::string& user_id) {
SetUserInputMethod(user_id, ime_state_.get());
WallpaperManager::Get()->SetUserWallpaperDelayed(user_id);
- ScreenlockBridge::Get()->SetFocusedUser(user_id);
+ GetScreenlockBridgeInstance()->SetFocusedUser(user_id);
if (delegate_)
delegate_->CheckUserStatus(user_id);
if (!test_focus_pod_callback_.is_null())

Powered by Google App Engine
This is Rietveld 408576698