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

Unified Diff: components/proximity_auth/remote_device_life_cycle_impl.h

Issue 1377313002: Revert of Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection
Patch Set: Created 5 years, 3 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/remote_device_life_cycle_impl.h
diff --git a/components/proximity_auth/remote_device_life_cycle_impl.h b/components/proximity_auth/remote_device_life_cycle_impl.h
index a4b983817121edb1529760a2b6142452445c746e..4a2912bd69978a24bd7a56845649db41ecb9298f 100644
--- a/components/proximity_auth/remote_device_life_cycle_impl.h
+++ b/components/proximity_auth/remote_device_life_cycle_impl.h
@@ -80,11 +80,23 @@
// The current state in the life cycle.
RemoteDeviceLifeCycle::State state_;
- // Observers added to the life cycle. Configured as NOTIFY_EXISTING_ONLY.
+ // Observers added to the life cycle.
base::ObserverList<Observer> observers_;
+
+ // Rate limits Bluetooth connections to the same device. Used to in the
+ // created ConnectionFinder.
+ scoped_ptr<BluetoothThrottler> bluetooth_throttler_;
+
+ // Used in the FINDING_CONNECTION state to establish a connection to the
+ // remote device.
+ scoped_ptr<ConnectionFinder> connection_finder_;
// The connection that is established by |connection_finder_|.
scoped_ptr<Connection> connection_;
+
+ // Authenticates the remote device after it is connected. Used in the
+ // AUTHENTICATING state.
+ scoped_ptr<Authenticator> authenticator_;
// Context for encrypting and decrypting messages. Created after
// authentication succeeds. Ownership is eventually passed to |messenger_|.
@@ -93,18 +105,6 @@
// The messenger for sending and receiving messages in the
// SECURE_CHANNEL_ESTABLISHED state.
scoped_ptr<Messenger> messenger_;
-
- // Authenticates the remote device after it is connected. Used in the
- // AUTHENTICATING state.
- scoped_ptr<Authenticator> authenticator_;
-
- // Used in the FINDING_CONNECTION state to establish a connection to the
- // remote device.
- scoped_ptr<ConnectionFinder> connection_finder_;
-
- // Rate limits Bluetooth connections to the same device. Used to in the
- // created ConnectionFinder.
- scoped_ptr<BluetoothThrottler> bluetooth_throttler_;
// After authentication fails, this timer waits for a period of time before
// retrying the connection.

Powered by Google App Engine
This is Rietveld 408576698