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

Unified Diff: components/copresence/copresence_manager_impl.cc

Issue 712833002: Undoing revert, cl is not the cause of gcm crash on canary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2214
Patch Set: Created 6 years, 1 month 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/copresence/copresence_manager_impl.h ('k') | components/copresence/handlers/gcm_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/copresence/copresence_manager_impl.cc
diff --git a/components/copresence/copresence_manager_impl.cc b/components/copresence/copresence_manager_impl.cc
index 265b042faeef87c252fa7d2c2c9f897eef59f309..2d5828a63cb5397abe39352659e45875d103e976 100644
--- a/components/copresence/copresence_manager_impl.cc
+++ b/components/copresence/copresence_manager_impl.cc
@@ -10,6 +10,7 @@
#include "base/strings/stringprintf.h"
#include "base/timer/timer.h"
#include "components/copresence/handlers/directive_handler.h"
+#include "components/copresence/handlers/gcm_handler.h"
#include "components/copresence/proto/rpcs.pb.h"
#include "components/copresence/public/whispernet_client.h"
#include "components/copresence/rpc/rpc_handler.h"
@@ -31,16 +32,22 @@ CopresenceManagerImpl::CopresenceManagerImpl(CopresenceDelegate* delegate)
&CopresenceManagerImpl::WhispernetInitComplete,
// This callback gets cancelled when we are destroyed.
base::Unretained(this))),
+ init_failed_(false),
directive_handler_(new DirectiveHandler),
poll_timer_(new base::RepeatingTimer<CopresenceManagerImpl>),
- audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>),
- init_failed_(false) {
+ audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>) {
DCHECK(delegate_);
DCHECK(delegate_->GetWhispernetClient());
delegate_->GetWhispernetClient()->Initialize(
whispernet_init_callback_.callback());
- rpc_handler_.reset(new RpcHandler(delegate_, directive_handler_.get()));
+ if (delegate->GetGCMDriver())
+ gcm_handler_.reset(new GCMHandler(delegate->GetGCMDriver(),
+ directive_handler_.get()));
+
+ rpc_handler_.reset(new RpcHandler(delegate,
+ directive_handler_.get(),
+ gcm_handler_.get()));
}
CopresenceManagerImpl::~CopresenceManagerImpl() {
« no previous file with comments | « components/copresence/copresence_manager_impl.h ('k') | components/copresence/handlers/gcm_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698