| 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 "base/stl_util.h" | |
| 8 #include "chrome/browser/copresence/chrome_whispernet_config.h" | 7 #include "chrome/browser/copresence/chrome_whispernet_config.h" |
| 9 #include "chrome/browser/extensions/api/copresence_private/copresence_private_ap
i.h" | 8 #include "chrome/browser/extensions/api/copresence_private/copresence_private_ap
i.h" |
| 10 #include "chrome/browser/extensions/component_loader.h" | 9 #include "chrome/browser/extensions/component_loader.h" |
| 11 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| 12 #include "chrome/common/extensions/api/copresence_private.h" | 11 #include "chrome/common/extensions/api/copresence_private.h" |
| 13 #include "content/public/browser/browser_context.h" | 12 #include "content/public/browser/browser_context.h" |
| 14 #include "extensions/browser/event_router.h" | 13 #include "extensions/browser/event_router.h" |
| 15 #include "extensions/browser/extension_system.h" | 14 #include "extensions/browser/extension_system.h" |
| 16 #include "grit/browser_resources.h" | 15 #include "grit/browser_resources.h" |
| 17 #include "media/audio/audio_manager.h" | 16 #include "media/audio/audio_manager.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 180 |
| 182 // Private functions. | 181 // Private functions. |
| 183 | 182 |
| 184 void ChromeWhispernetClient::AudioConfiguration(const AudioParamData& params) { | 183 void ChromeWhispernetClient::AudioConfiguration(const AudioParamData& params) { |
| 185 AudioParameters audio_params; | 184 AudioParameters audio_params; |
| 186 | 185 |
| 187 // We serialize AudioConfigData to a string and send it to the whispernet | 186 // We serialize AudioConfigData to a string and send it to the whispernet |
| 188 // nacl wrapper. | 187 // nacl wrapper. |
| 189 const size_t params_size = sizeof(params); | 188 const size_t params_size = sizeof(params); |
| 190 audio_params.param_data.resize(params_size); | 189 audio_params.param_data.resize(params_size); |
| 191 memcpy(vector_as_array(&audio_params.param_data), ¶ms, params_size); | 190 memcpy(audio_params.param_data.data(), ¶ms, params_size); |
| 192 | 191 |
| 193 DVLOG(3) << "Configuring audio for client " << client_id_; | 192 DVLOG(3) << "Configuring audio for client " << client_id_; |
| 194 SendEventIfLoaded(make_scoped_ptr(new Event( | 193 SendEventIfLoaded(make_scoped_ptr(new Event( |
| 195 extensions::events::COPRESENCE_PRIVATE_ON_CONFIG_AUDIO, | 194 extensions::events::COPRESENCE_PRIVATE_ON_CONFIG_AUDIO, |
| 196 OnConfigAudio::kEventName, | 195 OnConfigAudio::kEventName, |
| 197 OnConfigAudio::Create(client_id_, audio_params), browser_context_))); | 196 OnConfigAudio::Create(client_id_, audio_params), browser_context_))); |
| 198 } | 197 } |
| 199 | 198 |
| 200 void ChromeWhispernetClient::SendEventIfLoaded( | 199 void ChromeWhispernetClient::SendEventIfLoaded( |
| 201 scoped_ptr<extensions::Event> event) { | 200 scoped_ptr<extensions::Event> event) { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 223 // Thus we can just discard the pointers at the end. | 222 // Thus we can just discard the pointers at the end. |
| 224 DCHECK(event_router_); | 223 DCHECK(event_router_); |
| 225 for (Event* event : queued_events_) { | 224 for (Event* event : queued_events_) { |
| 226 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, | 225 event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId, |
| 227 make_scoped_ptr(event)); | 226 make_scoped_ptr(event)); |
| 228 } | 227 } |
| 229 queued_events_.weak_clear(); | 228 queued_events_.weak_clear(); |
| 230 | 229 |
| 231 extension_loaded_ = true; | 230 extension_loaded_ = true; |
| 232 } | 231 } |
| OLD | NEW |