chrome/browser/ui/webui/signin/user_manager_screen_handler.cc - Issue 1096293003: Move screenlock_bridge to components/proximity_auth

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/signin/user_manager_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: Add proximity auth client and the chrome glue. 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

« chrome/browser/signin/easy_unlock_util.cc ('K') | « chrome/browser/ui/webui/signin/user_manager_screen_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | components/proximity_auth/proximity_auth_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

index feddfc81a34970e70dc555e1958a80cb6c6bc460..b45119efba1996a73117dc9d246abe9bd4aa991d 100644

--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/profiles/profile_metrics.h"

#include "chrome/browser/profiles/profile_window.h"

#include "chrome/browser/profiles/profiles_state.h"

+#include "chrome/browser/signin/easy_unlock_util.h"

#include "chrome/browser/signin/local_auth.h"

#include "chrome/browser/ui/app_list/app_list_service.h"

#include "chrome/browser/ui/browser_commands.h"

@@ -297,7 +298,7 @@ UserManagerScreenHandler::UserManagerScreenHandler()

}

UserManagerScreenHandler::~UserManagerScreenHandler() {

- ScreenlockBridge::Get()->SetLockHandler(NULL);

+ GetScreenlockBridgeInstance()->SetLockHandler(NULL);

}

void UserManagerScreenHandler::ShowBannerMessage(

@@ -388,7 +389,7 @@ void UserManagerScreenHandler::HandleInitialize(const base::ListValue* args) {

desktop_type_ = chrome::GetHostDesktopTypeForNativeView(

web_ui()->GetWebContents()->GetNativeView());

- ScreenlockBridge::Get()->SetLockHandler(this);

+ GetScreenlockBridgeInstance()->SetLockHandler(this);

}

void UserManagerScreenHandler::HandleAddUser(const base::ListValue* args) {