OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_platform_audio_input.h" | 5 #include "content/renderer/pepper/pepper_platform_audio_input.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 if (client_) | 282 if (client_) |
283 client_->StreamCreationFailed(); | 283 client_->StreamCreationFailed(); |
284 } | 284 } |
285 | 285 |
286 PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() { | 286 PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() { |
287 DCHECK(main_message_loop_proxy_->BelongsToCurrentThread()); | 287 DCHECK(main_message_loop_proxy_->BelongsToCurrentThread()); |
288 | 288 |
289 RenderFrameImpl* const render_frame = | 289 RenderFrameImpl* const render_frame = |
290 RenderFrameImpl::FromRoutingID(render_frame_id_); | 290 RenderFrameImpl::FromRoutingID(render_frame_id_); |
291 return render_frame ? | 291 return render_frame ? |
292 PepperMediaDeviceManager::GetForRenderFrame(render_frame) : NULL; | 292 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL; |
293 } | 293 } |
294 | 294 |
295 } // namespace content | 295 } // namespace content |
OLD | NEW |