chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.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/chromeos/login/easy_unlock/easy_unlock_reauth.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

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

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc

index 1882dcb7dc2ec4d860242497517a9203fb5b1da4..f56fbbb6b7f88ca047542b6e0fa420f6e8ea98d9 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc

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

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"

#include "chrome/browser/chromeos/login/lock/screen_locker.h"

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

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

#include "chrome/grit/generated_resources.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/login/auth/auth_status_consumer.h"

#include "chromeos/login/auth/user_context.h"

+#include "components/proximity_auth/screenlock_bridge.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -74,8 +75,9 @@ class ReauthHandler : public content::NotificationObserver,

screen_locker->SetLoginStatusConsumer(this);

// Show tooltip explaining reauth.

- ScreenlockBridge::UserPodCustomIconOptions icon_options;

- icon_options.SetIcon(ScreenlockBridge::USER_POD_CUSTOM_ICON_NONE);

+ proximity_auth::ScreenlockBridge::UserPodCustomIconOptions icon_options;

+ icon_options.SetIcon(

+ proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_NONE);

icon_options.SetTooltip(

l10n_util::GetStringUTF16(

IDS_SMART_LOCK_SCREENLOCK_TOOLTIP_HARDLOCK_REAUTH_USER),

@@ -83,7 +85,7 @@ class ReauthHandler : public content::NotificationObserver,

const user_manager::UserList& lock_users = screen_locker->users();

DCHECK(lock_users.size() == 1);

- ScreenlockBridge::Get()->lock_handler()->ShowUserPodCustomIcon(

+ GetScreenlockBridgeInstance()->lock_handler()->ShowUserPodCustomIcon(

lock_users[0]->email(), icon_options);

}