chrome/browser/chromeos/login/screens/user_selection_screen.h - 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/chromeos/login/screens/user_selection_screen.h

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix linux build 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

« no previous file with comments | « chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/user_selection_screen.h

diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h

index 74eab73c32f9b556463fbd86d970cc03ee9ae4f3..79b14d79f6cc954e0d736c0f0021fa499639767f 100644

--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h

+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h

@@ -15,7 +15,7 @@

#include "chrome/browser/chromeos/login/signin/token_handle_util.h"

#include "chrome/browser/chromeos/login/ui/login_display.h"

#include "chrome/browser/chromeos/login/ui/models/user_board_model.h"

-#include "chrome/browser/signin/screenlock_bridge.h"

+#include "components/signin/content/screenlock_bridge.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_id.h"

#include "ui/base/user_activity/user_activity_observer.h"

@@ -75,6 +75,8 @@ class UserSelectionScreen : public ui::UserActivityObserver,

AuthType GetAuthType(const std::string& user_email) const override;

ScreenType GetScreenType() const override;

+ void Lock(content::BrowserContext* browser_context) override;

+ void Unlock(content::BrowserContext* browser_context) override;

void Unlock(const std::string& user_email) override;

void AttemptEasySignin(const std::string& user_email,

const std::string& secret,