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

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker.h

Issue 2903353003: Adding mojo calls for easy unlock service (Closed)
Patch Set: comments and rebase Created 3 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 | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/screen_locker.h
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.h b/chrome/browser/chromeos/login/lock/screen_locker.h
index dba07eb44bdd26fa11b408c417e09a9f89f03d63..62bb07343362bcbb7f0f3ceb2feaa32353f31a7c 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/screen_locker.h
@@ -35,6 +35,7 @@ class ExtendedAuthenticator;
class AuthFailure;
class ScreenlockIconProvider;
class WebUIScreenLocker;
+class ViewsScreenLocker;
namespace test {
class ScreenLockerTester;
@@ -183,6 +184,7 @@ class ScreenLocker : public AuthStatusConsumer,
friend class test::ScreenLockerViewsTester;
friend class test::WebUIScreenLockerTester;
friend class WebUIScreenLocker;
+ friend class ViewsScreenLocker;
// Track whether the user used pin or password to unlock the lock screen.
// Values corrospond to UMA histograms, do not modify, or add or delete other
@@ -233,7 +235,6 @@ class ScreenLocker : public AuthStatusConsumer,
// Delegate used to talk to the view.
Delegate* delegate_ = nullptr;
- bool owns_delegate_ = false;
// Users that can unlock the device.
user_manager::UserList users_;
@@ -280,6 +281,9 @@ class ScreenLocker : public AuthStatusConsumer,
device::mojom::FingerprintPtr fp_service_;
mojo::Binding<device::mojom::FingerprintObserver> binding_;
+ // ViewsScreenLocker instance in use.
+ std::unique_ptr<ViewsScreenLocker> views_screen_locker_;
+
base::WeakPtrFactory<ScreenLocker> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ScreenLocker);
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698