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

Unified Diff: components/proximity_auth/screenlock_bridge.h

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: Disable tests on non-ChromeOS, since there's nothing left to test on the other platforms 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
« no previous file with comments | « components/proximity_auth/proximity_auth_client.h ('k') | components/proximity_auth/screenlock_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/proximity_auth/screenlock_bridge.h
diff --git a/components/proximity_auth/screenlock_bridge.h b/components/proximity_auth/screenlock_bridge.h
index f9a47a45fcd10f9d0e62b6ec5366a2b269054a13..92cc94f0a8d90bdba350aba8aa34ba140a0386e2 100644
--- a/components/proximity_auth/screenlock_bridge.h
+++ b/components/proximity_auth/screenlock_bridge.h
@@ -14,14 +14,8 @@
#include "base/strings/string16.h"
#include "base/values.h"
-namespace content {
-class BrowserContext;
-} // namespace content
-
namespace proximity_auth {
-class ProximityAuthClient;
-
// ScreenlockBridge brings together the screenLockPrivate API and underlying
// support. On ChromeOS, it delegates calls to the ScreenLocker. On other
// platforms, it delegates calls to UserManagerUI (and friends).
@@ -29,8 +23,7 @@ class ProximityAuthClient;
// used solely for the lock screen anymore.
class ScreenlockBridge {
public:
- // |client| is not owned and must outlive this object.
- explicit ScreenlockBridge(ProximityAuthClient* client);
+ ScreenlockBridge();
~ScreenlockBridge();
// User pod icons supported by lock screen / signin screen UI.
@@ -165,8 +158,10 @@ class ScreenlockBridge {
void SetFocusedUser(const std::string& user_id);
bool IsLocked() const;
- void Lock(content::BrowserContext* browser_context);
- void Unlock(content::BrowserContext* browser_context);
+ void Lock();
+
+ // Unlocks the screen for the authenticated user with the given |user_email|.
+ void Unlock(const std::string& user_email);
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
@@ -176,7 +171,6 @@ class ScreenlockBridge {
std::string focused_user_id() const { return focused_user_id_; }
private:
- ProximityAuthClient* client_; // Not owned. Must outlive this object.
LockHandler* lock_handler_; // Not owned
// The last focused user's id.
std::string focused_user_id_;
« no previous file with comments | « components/proximity_auth/proximity_auth_client.h ('k') | components/proximity_auth/screenlock_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698