Index: components/copresence/copresence_manager_impl.h |
diff --git a/components/copresence/copresence_manager_impl.h b/components/copresence/copresence_manager_impl.h |
index 12bc051e712fa7af7c2892f1fea9a20ca6bde1b2..d91e7aeddb7dec86fcf5f6f0499814dee4365750 100644 |
--- a/components/copresence/copresence_manager_impl.h |
+++ b/components/copresence/copresence_manager_impl.h |
@@ -23,6 +23,7 @@ class URLContextGetter; |
namespace copresence { |
class DirectiveHandler; |
+class GCMHandler; |
class ReportRequest; |
class RpcHandler; |
class WhispernetClient; |
@@ -61,16 +62,17 @@ class CopresenceManagerImpl : public CopresenceManager { |
// does not provide a way to unregister its init callback. |
base::CancelableCallback<void(bool)> whispernet_init_callback_; |
- // The |directive handler_| needs to destruct before |rpc_handler_|, do not |
- // change this order. |
+ bool init_failed_; |
+ |
+ // The GCMHandler must destruct before the DirectiveHandler, |
+ // which must destruct before the RpcHandler. Do not change this order. |
scoped_ptr<RpcHandler> rpc_handler_; |
scoped_ptr<DirectiveHandler> directive_handler_; |
+ scoped_ptr<GCMHandler> gcm_handler_; |
scoped_ptr<base::Timer> poll_timer_; |
scoped_ptr<base::Timer> audio_check_timer_; |
- bool init_failed_; |
- |
DISALLOW_COPY_AND_ASSIGN(CopresenceManagerImpl); |
}; |