Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: components/proximity_auth/screenlock_bridge.cc

Issue 1209193003: [Proximity Auth] Create one ProximityAuthClient per profile, rather than one global one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
Index: components/proximity_auth/screenlock_bridge.cc
diff --git a/components/proximity_auth/screenlock_bridge.cc b/components/proximity_auth/screenlock_bridge.cc
index 2af83781dc0dfe986a4ffb3114cf1781361ab2ce..9d70799735e94df0a185bd06a942adea49e98921 100644
--- a/components/proximity_auth/screenlock_bridge.cc
+++ b/components/proximity_auth/screenlock_bridge.cc
@@ -49,9 +49,7 @@ std::string GetIdForIcon(ScreenlockBridge::UserPodCustomIcon icon) {
} // namespace
-ScreenlockBridge::ScreenlockBridge(ProximityAuthClient* client)
- : client_(client), lock_handler_(nullptr) {
- DCHECK(client_);
+ScreenlockBridge::ScreenlockBridge() : lock_handler_(nullptr) {
}
ScreenlockBridge::~ScreenlockBridge() {
@@ -150,19 +148,19 @@ bool ScreenlockBridge::IsLocked() const {
return lock_handler_ != nullptr;
}
-void ScreenlockBridge::Lock(content::BrowserContext* browser_context) {
+void ScreenlockBridge::Lock(ProximityAuthClient* client) {
Tim Song 2015/06/26 23:46:43 Hmm... requiring the client here couples the Scree
Ilya Sherman 2015/06/27 08:18:00 I removed the Lock() implementation for now, since
#if defined(OS_CHROMEOS)
chromeos::SessionManagerClient* session_manager =
chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
session_manager->RequestLockScreen();
#else
- client_->Lock(browser_context);
+ client->Lock();
#endif
}
-void ScreenlockBridge::Unlock(content::BrowserContext* browser_context) {
+void ScreenlockBridge::Unlock(ProximityAuthClient* client) {
Tim Song 2015/06/26 23:46:43 I think it would be better to take the username di
Ilya Sherman 2015/06/27 08:18:00 Done.
if (lock_handler_)
- lock_handler_->Unlock(client_->GetAuthenticatedUsername(browser_context));
+ lock_handler_->Unlock(client->GetAuthenticatedUsername());
}
void ScreenlockBridge::AddObserver(Observer* observer) {

Powered by Google App Engine
This is Rietveld 408576698