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

Side by Side Diff: google_apis/gcm/engine/mcs_client.cc

Issue 641943002: components: Introduce AlarmTimer class and use it for GCM heartbeat (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp files Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "google_apis/gcm/engine/mcs_client.h" 5 #include "google_apis/gcm/engine/mcs_client.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h"
10 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
11 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
12 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
13 #include "base/time/clock.h" 14 #include "base/time/clock.h"
14 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "base/timer/timer.h"
15 #include "google_apis/gcm/base/mcs_util.h" 17 #include "google_apis/gcm/base/mcs_util.h"
16 #include "google_apis/gcm/base/socket_stream.h" 18 #include "google_apis/gcm/base/socket_stream.h"
17 #include "google_apis/gcm/engine/connection_factory.h" 19 #include "google_apis/gcm/engine/connection_factory.h"
18 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h" 20 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
19 21
20 using namespace google::protobuf::io; 22 using namespace google::protobuf::io;
21 23
22 namespace gcm { 24 namespace gcm {
23 25
24 namespace { 26 namespace {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 stream_id_out_(0), 172 stream_id_out_(0),
171 stream_id_in_(0), 173 stream_id_in_(0),
172 gcm_store_(gcm_store), 174 gcm_store_(gcm_store),
173 recorder_(recorder), 175 recorder_(recorder),
174 weak_ptr_factory_(this) { 176 weak_ptr_factory_(this) {
175 } 177 }
176 178
177 MCSClient::~MCSClient() { 179 MCSClient::~MCSClient() {
178 } 180 }
179 181
182 void MCSClient::SetHeartbeatTimer(scoped_ptr<base::Timer> timer) {
183 heartbeat_manager_.SetHeartbeatTimer(timer.Pass());
184 }
185
180 void MCSClient::Initialize( 186 void MCSClient::Initialize(
181 const ErrorCallback& error_callback, 187 const ErrorCallback& error_callback,
182 const OnMessageReceivedCallback& message_received_callback, 188 const OnMessageReceivedCallback& message_received_callback,
183 const OnMessageSentCallback& message_sent_callback, 189 const OnMessageSentCallback& message_sent_callback,
184 scoped_ptr<GCMStore::LoadResult> load_result) { 190 scoped_ptr<GCMStore::LoadResult> load_result) {
185 DCHECK_EQ(state_, UNINITIALIZED); 191 DCHECK_EQ(state_, UNINITIALIZED);
186 192
187 state_ = LOADED; 193 state_ = LOADED;
188 mcs_error_callback_ = error_callback; 194 mcs_error_callback_ = error_callback;
189 message_received_callback_ = message_received_callback; 195 message_received_callback_ = message_received_callback;
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 reinterpret_cast<mcs_proto::DataMessageStanza*>(packet->protobuf.get()); 903 reinterpret_cast<mcs_proto::DataMessageStanza*>(packet->protobuf.get());
898 CollapseKey collapse_key(*data_message); 904 CollapseKey collapse_key(*data_message);
899 if (collapse_key.IsValid()) 905 if (collapse_key.IsValid())
900 collapse_key_map_.erase(collapse_key); 906 collapse_key_map_.erase(collapse_key);
901 } 907 }
902 908
903 return packet; 909 return packet;
904 } 910 }
905 911
906 } // namespace gcm 912 } // namespace gcm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698