chrome/browser/signin/easy_unlock_service.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/signin/easy_unlock_service.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

« chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc ('K') | « chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.h » ('j') | chrome/browser/signin/easy_unlock_service_regular.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/easy_unlock_service.cc

diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc

index 9af5d0c71df8199296c41b10d97df57c503e23e6..5ad27c1b4b21354073d1d0e0dabdb61e6af16180 100644

--- a/chrome/browser/signin/easy_unlock_service.cc

+++ b/chrome/browser/signin/easy_unlock_service.cc

@@ -22,12 +22,13 @@

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

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

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

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/pref_names.h"

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/proximity_auth/ble/proximity_auth_ble_system.h"

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

#include "components/proximity_auth/switches.h"

#include "components/user_manager/user.h"

#include "device/bluetooth/bluetooth_adapter.h"

@@ -454,9 +455,7 @@ EasyUnlockScreenlockStateHandler*

return NULL;

if (!screenlock_state_handler_) {

screenlock_state_handler_.reset(new EasyUnlockScreenlockStateHandler(

- GetUserEmail(),

- GetHardlockState(),

- ScreenlockBridge::Get()));

+ GetUserEmail(), GetHardlockState(), GetScreenlockBridgeInstance()));

}

return screenlock_state_handler_.get();

}