OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/gcm_driver/gcm_driver_desktop.h" | 5 #include "components/gcm_driver/gcm_driver_desktop.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 scoped_ptr<GCMClientFactory> gcm_client_factory, | 497 scoped_ptr<GCMClientFactory> gcm_client_factory, |
498 const GCMClient::ChromeBuildInfo& chrome_build_info, | 498 const GCMClient::ChromeBuildInfo& chrome_build_info, |
499 const std::string& channel_status_request_url, | 499 const std::string& channel_status_request_url, |
500 const std::string& user_agent, | 500 const std::string& user_agent, |
501 PrefService* prefs, | 501 PrefService* prefs, |
502 const base::FilePath& store_path, | 502 const base::FilePath& store_path, |
503 const scoped_refptr<net::URLRequestContextGetter>& request_context, | 503 const scoped_refptr<net::URLRequestContextGetter>& request_context, |
504 const scoped_refptr<base::SequencedTaskRunner>& ui_thread, | 504 const scoped_refptr<base::SequencedTaskRunner>& ui_thread, |
505 const scoped_refptr<base::SequencedTaskRunner>& io_thread, | 505 const scoped_refptr<base::SequencedTaskRunner>& io_thread, |
506 const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) | 506 const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) |
507 : gcm_channel_status_syncer_( | 507 : GCMDriver(store_path, blocking_task_runner), |
| 508 gcm_channel_status_syncer_( |
508 new GCMChannelStatusSyncer(this, | 509 new GCMChannelStatusSyncer(this, |
509 prefs, | 510 prefs, |
510 channel_status_request_url, | 511 channel_status_request_url, |
511 user_agent, | 512 user_agent, |
512 request_context)), | 513 request_context)), |
513 signed_in_(false), | 514 signed_in_(false), |
514 gcm_started_(false), | 515 gcm_started_(false), |
515 gcm_enabled_(true), | 516 gcm_enabled_(true), |
516 connected_(false), | 517 connected_(false), |
517 account_mapper_(new GCMAccountMapper(this)), | 518 account_mapper_(new GCMAccountMapper(this)), |
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 | 1298 |
1298 if (base::get<1>(a) < base::get<1>(b)) | 1299 if (base::get<1>(a) < base::get<1>(b)) |
1299 return true; | 1300 return true; |
1300 if (base::get<1>(a) > base::get<1>(b)) | 1301 if (base::get<1>(a) > base::get<1>(b)) |
1301 return false; | 1302 return false; |
1302 | 1303 |
1303 return base::get<2>(a) < base::get<2>(b); | 1304 return base::get<2>(a) < base::get<2>(b); |
1304 } | 1305 } |
1305 | 1306 |
1306 } // namespace gcm | 1307 } // namespace gcm |
OLD | NEW |