Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Side by Side Diff: content/renderer/pepper/pepper_platform_audio_input.cc

Issue 702783002: [Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 if (client_) 283 if (client_)
284 client_->StreamCreationFailed(); 284 client_->StreamCreationFailed();
285 } 285 }
286 286
287 PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() { 287 PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() {
288 DCHECK(main_message_loop_proxy_->BelongsToCurrentThread()); 288 DCHECK(main_message_loop_proxy_->BelongsToCurrentThread());
289 289
290 RenderFrameImpl* const render_frame = 290 RenderFrameImpl* const render_frame =
291 RenderFrameImpl::FromRoutingID(render_frame_id_); 291 RenderFrameImpl::FromRoutingID(render_frame_id_);
292 return render_frame ? 292 return render_frame ?
293 PepperMediaDeviceManager::GetForRenderFrame(render_frame) : NULL; 293 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
294 } 294 }
295 295
296 } // namespace content 296 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_media_device_manager.cc ('k') | content/renderer/pepper/pepper_platform_video_capture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698