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

Unified Diff: google_apis/gcm/engine/mcs_client.cc

Issue 171683002: [GCM] Fix gcm login to properly identify chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review Created 6 years, 10 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
« no previous file with comments | « google_apis/gcm/engine/mcs_client.h ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/engine/mcs_client.cc
diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_client.cc
index e81a82943d04674ad162ad5dc68684781549be35..adae939aad98065c655fd4023b04db44ebe712a1 100644
--- a/google_apis/gcm/engine/mcs_client.cc
+++ b/google_apis/gcm/engine/mcs_client.cc
@@ -126,10 +126,12 @@ ReliablePacketInfo::ReliablePacketInfo()
}
ReliablePacketInfo::~ReliablePacketInfo() {}
-MCSClient::MCSClient(base::Clock* clock,
+MCSClient::MCSClient(const std::string& version_string,
+ base::Clock* clock,
ConnectionFactory* connection_factory,
GCMStore* gcm_store)
- : clock_(clock),
+ : version_string_(version_string),
+ clock_(clock),
state_(UNINITIALIZED),
android_id_(0),
security_token_(0),
@@ -369,7 +371,9 @@ void MCSClient::ResetStateAndBuildLoginRequest(
acked_server_ids_.clear();
// Then build the request, consuming all pending acknowledgments.
- request->Swap(BuildLoginRequest(android_id_, security_token_).get());
+ request->Swap(BuildLoginRequest(android_id_,
+ security_token_,
+ version_string_).get());
for (PersistentIdList::const_iterator iter =
restored_unackeds_server_ids_.begin();
iter != restored_unackeds_server_ids_.end(); ++iter) {
« no previous file with comments | « google_apis/gcm/engine/mcs_client.h ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698