chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.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/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

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

« chrome/browser/chromeos/login/screens/user_selection_screen.cc ('K') | « chrome/browser/chromeos/login/ui/views/user_board_view.h ('k') | chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h » ('j') | chrome/browser/signin/easy_unlock_service_regular.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

index bb99a6a1ebc20a5314036ecb268757882f9df7fd..898c7e57983bca18f12ce7322863e258137579e3 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

@@ -17,13 +17,13 @@

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

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

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

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

#include "chrome/browser/ui/proximity_auth/proximity_auth_error_bubble.h"

#include "chrome/common/extensions/api/easy_unlock_private.h"

#include "chrome/grit/generated_resources.h"

#include "components/proximity_auth/bluetooth_util.h"

#include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h"

#include "components/proximity_auth/switches.h"

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

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

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

#include "extensions/browser/browser_context_keyed_api_factory.h"