| Index: remoting/host/host_signaling_manager.h
|
| diff --git a/remoting/host/host_signaling_manager.h b/remoting/host/host_signaling_manager.h
|
| index e62d26714e086eb37b3c20dcc1cf700837624e34..f042f958b38148f5b1c0881103b4c3684542c416 100644
|
| --- a/remoting/host/host_signaling_manager.h
|
| +++ b/remoting/host/host_signaling_manager.h
|
| @@ -20,6 +20,9 @@ class TimeDelta;
|
|
|
| namespace remoting {
|
|
|
| +class GcdNotificationSubscriber;
|
| +class GcdRestClient;
|
| +class GcdStateUpdater;
|
| class HeartbeatSender;
|
| class OAuthTokenGetter;
|
| class SignalStrategy;
|
| @@ -58,8 +61,8 @@ class HostSignalingManager {
|
| const std::string& host_id,
|
| const scoped_refptr<const RsaKeyPair>& host_key_pair,
|
| const std::string& directory_bot_jid,
|
| - scoped_ptr<OAuthTokenGetter::OAuthCredentials> oauth_credentials,
|
| - bool verify_email);
|
| + OAuthTokenGetter* oauth_token_getter,
|
| + GcdRestClient* gcd_client_);
|
|
|
| ~HostSignalingManager();
|
|
|
| @@ -80,10 +83,11 @@ class HostSignalingManager {
|
| const base::Callback<void(bool success)>& ack_callback);
|
|
|
| private:
|
| - HostSignalingManager(
|
| - scoped_ptr<SignalStrategy> signal_strategy,
|
| - scoped_ptr<SignalingConnector> signaling_connector,
|
| - scoped_ptr<HeartbeatSender> heartbeat_sender);
|
| + HostSignalingManager(scoped_ptr<SignalStrategy> signal_strategy,
|
| + scoped_ptr<SignalingConnector> signaling_connector,
|
| + scoped_ptr<HeartbeatSender> heartbeat_sender,
|
| + scoped_ptr<GcdStateUpdater> gcd_state_updater,
|
| + scoped_ptr<GcdNotificationSubscriber> gcd_subscriber);
|
|
|
| // |heartbeat_sender_| and |signaling_connector_| have to be destroyed before
|
| // |signal_strategy_| because their destructors need to call
|
| @@ -91,6 +95,8 @@ class HostSignalingManager {
|
| scoped_ptr<SignalStrategy> signal_strategy_;
|
| scoped_ptr<SignalingConnector> signaling_connector_;
|
| scoped_ptr<HeartbeatSender> heartbeat_sender_;
|
| + scoped_ptr<GcdStateUpdater> gcd_state_updater_;
|
| + scoped_ptr<GcdNotificationSubscriber> gcd_subscriber_;
|
|
|
| // Used to verify thread-safe usage.
|
| base::ThreadChecker thread_checker_;
|
|
|