| 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.h" | 5 #include "components/gcm_driver/gcm_driver.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 11 #include "base/logging.h" | 13 #include "base/logging.h" |
| 12 #include "components/gcm_driver/gcm_app_handler.h" | 14 #include "components/gcm_driver/gcm_app_handler.h" |
| 13 | 15 |
| 14 namespace gcm { | 16 namespace gcm { |
| 15 | 17 |
| 16 namespace { | 18 namespace { |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 GCMClient::Result result) { | 290 GCMClient::Result result) { |
| 289 // Invoke the original unregister callback. | 291 // Invoke the original unregister callback. |
| 290 unregister_callback.Run(result); | 292 unregister_callback.Run(result); |
| 291 | 293 |
| 292 // Trigger the pending registration. | 294 // Trigger the pending registration. |
| 293 DCHECK(register_callbacks_.find(app_id) != register_callbacks_.end()); | 295 DCHECK(register_callbacks_.find(app_id) != register_callbacks_.end()); |
| 294 RegisterImpl(app_id, normalized_sender_ids); | 296 RegisterImpl(app_id, normalized_sender_ids); |
| 295 } | 297 } |
| 296 | 298 |
| 297 } // namespace gcm | 299 } // namespace gcm |
| OLD | NEW |