chrome/browser/chromeos/login/screens/user_selection_screen.h - Issue 592893002: Rename ScreelockBridge to SigninScreenBridge

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 592893002: Rename ScreelockBridge to SigninScreenBridge Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_auth_handler

Patch Set: Created 6 years, 3 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/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »
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 6302e2d4e6650d82330baffd8ec1e28410bd5729..bc2c4b0ce70757ba949bc025b7e95db6e87fdf83 100644

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

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

@@ -12,7 +12,7 @@

#include "base/compiler_specific.h"

#include "base/timer/timer.h"

#include "base/values.h"

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

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

#include "components/user_manager/user.h"

#include "ui/wm/core/user_activity_observer.h"

@@ -43,8 +43,8 @@ class UserSelectionScreen : public wm::UserActivityObserver {

virtual void SendUserList();

void HandleGetUsers();

void SetAuthType(const std::string& username,

- ScreenlockBridge::LockHandler::AuthType auth_type);

- ScreenlockBridge::LockHandler::AuthType GetAuthType(

+ SigninScreenBridge::LockHandler::AuthType auth_type);

+ SigninScreenBridge::LockHandler::AuthType GetAuthType(

const std::string& username) const;

// wm::UserActivityDetector implementation:

@@ -55,7 +55,7 @@ class UserSelectionScreen : public wm::UserActivityObserver {

user_manager::User* user,

bool is_owner,

bool is_signin_to_add,

- ScreenlockBridge::LockHandler::AuthType auth_type,

+ SigninScreenBridge::LockHandler::AuthType auth_type,

const std::vector<std::string>* public_session_recommended_locales,

base::DictionaryValue* user_dict);

@@ -79,7 +79,7 @@ class UserSelectionScreen : public wm::UserActivityObserver {

// Map of usernames to their current authentication type. If a user is not

// contained in the map, it is using the default authentication type.

- std::map<std::string, ScreenlockBridge::LockHandler::AuthType>

+ std::map<std::string, SigninScreenBridge::LockHandler::AuthType>

user_auth_type_map_;

// Timer for measuring idle state duration before password clear.