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 "chrome/browser/copresence/chrome_whispernet_client.h" | 5 #include "chrome/browser/copresence/chrome_whispernet_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "chrome/browser/copresence/chrome_whispernet_config.h" | 10 #include "chrome/browser/copresence/chrome_whispernet_config.h" |
10 #include "chrome/browser/extensions/api/copresence_private/copresence_private_ap
i.h" | 11 #include "chrome/browser/extensions/api/copresence_private/copresence_private_ap
i.h" |
11 #include "chrome/browser/extensions/component_loader.h" | 12 #include "chrome/browser/extensions/component_loader.h" |
12 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
13 #include "chrome/common/extensions/api/copresence_private.h" | 14 #include "chrome/common/extensions/api/copresence_private.h" |
14 #include "content/public/browser/browser_context.h" | 15 #include "content/public/browser/browser_context.h" |
15 #include "extensions/browser/event_router.h" | 16 #include "extensions/browser/event_router.h" |
16 #include "extensions/browser/extension_system.h" | 17 #include "extensions/browser/extension_system.h" |
17 #include "grit/browser_resources.h" | 18 #include "grit/browser_resources.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 OnConfigAudio::kEventName, | 198 OnConfigAudio::kEventName, |
198 OnConfigAudio::Create(client_id_, audio_params), browser_context_))); | 199 OnConfigAudio::Create(client_id_, audio_params), browser_context_))); |
199 } | 200 } |
200 | 201 |
201 void ChromeWhispernetClient::SendEventIfLoaded( | 202 void ChromeWhispernetClient::SendEventIfLoaded( |
202 scoped_ptr<extensions::Event> event) { | 203 scoped_ptr<extensions::Event> event) { |
203 DCHECK(event_router_); | 204 DCHECK(event_router_); |
204 | 205 |
205 if (extension_loaded_) { | 206 if (extension_loaded_) { |
206 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, | 207 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, |
207 event.Pass()); | 208 std::move(event)); |
208 } else { | 209 } else { |
209 DVLOG(2) << "Queueing event " << event->event_name | 210 DVLOG(2) << "Queueing event " << event->event_name |
210 << " for client " << client_id_; | 211 << " for client " << client_id_; |
211 queued_events_.push_back(event.release()); | 212 queued_events_.push_back(event.release()); |
212 } | 213 } |
213 } | 214 } |
214 | 215 |
215 void ChromeWhispernetClient::OnExtensionLoaded(bool success) { | 216 void ChromeWhispernetClient::OnExtensionLoaded(bool success) { |
216 DCHECK(!init_callback_.is_null()); | 217 DCHECK(!init_callback_.is_null()); |
217 init_callback_.Run(success); | 218 init_callback_.Run(success); |
218 | 219 |
219 DVLOG(3) << "Sending " << queued_events_.size() | 220 DVLOG(3) << "Sending " << queued_events_.size() |
220 << " queued requests to whispernet from client " | 221 << " queued requests to whispernet from client " |
221 << client_id_; | 222 << client_id_; |
222 | 223 |
223 // In this loop, ownership of each Event is passed to a scoped_ptr instead. | 224 // In this loop, ownership of each Event is passed to a scoped_ptr instead. |
224 // Thus we can just discard the pointers at the end. | 225 // Thus we can just discard the pointers at the end. |
225 DCHECK(event_router_); | 226 DCHECK(event_router_); |
226 for (Event* event : queued_events_) { | 227 for (Event* event : queued_events_) { |
227 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, | 228 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, |
228 make_scoped_ptr(event)); | 229 make_scoped_ptr(event)); |
229 } | 230 } |
230 queued_events_.weak_clear(); | 231 queued_events_.weak_clear(); |
231 | 232 |
232 extension_loaded_ = true; | 233 extension_loaded_ = true; |
233 } | 234 } |
OLD | NEW |