Index: components/gcm_driver/gcm_driver_desktop.cc |
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc |
index 82ca4b34320e1c14ef5e4e61e76307da0c1537ca..b2d2e558c32c207b63bbd799f9d1fa1a4eb0d680 100644 |
--- a/components/gcm_driver/gcm_driver_desktop.cc |
+++ b/components/gcm_driver/gcm_driver_desktop.cc |
@@ -50,7 +50,8 @@ class GCMDriverDesktop::IOWorker : public GCMClient::Delegate { |
const GCMClient::SendErrorDetails& send_error_details) OVERRIDE; |
virtual void OnSendAcknowledged(const std::string& app_id, |
const std::string& message_id) OVERRIDE; |
- virtual void OnGCMReady() OVERRIDE; |
+ virtual void OnGCMReady( |
+ const std::vector<AccountMapping>& account_mappings) OVERRIDE; |
virtual void OnActivityRecorded() OVERRIDE; |
virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE; |
virtual void OnDisconnected() OVERRIDE; |
@@ -201,10 +202,12 @@ void GCMDriverDesktop::IOWorker::OnSendAcknowledged( |
&GCMDriverDesktop::SendAcknowledged, service_, app_id, message_id)); |
} |
-void GCMDriverDesktop::IOWorker::OnGCMReady() { |
+void GCMDriverDesktop::IOWorker::OnGCMReady( |
+ const std::vector<AccountMapping>& account_mappings) { |
ui_thread_->PostTask( |
FROM_HERE, |
- base::Bind(&GCMDriverDesktop::GCMClientReady, service_)); |
+ base::Bind( |
+ &GCMDriverDesktop::GCMClientReady, service_, account_mappings)); |
} |
void GCMDriverDesktop::IOWorker::OnActivityRecorded() { |
@@ -714,7 +717,8 @@ void GCMDriverDesktop::SendAcknowledged(const std::string& app_id, |
GetAppHandler(app_id)->OnSendAcknowledged(app_id, message_id); |
} |
-void GCMDriverDesktop::GCMClientReady() { |
+void GCMDriverDesktop::GCMClientReady( |
+ const std::vector<AccountMapping>& account_mappings) { |
DCHECK(ui_thread_->RunsTasksOnCurrentThread()); |
delayed_task_controller_->SetReady(); |