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

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

Issue 2034663003: Remove use of deprecated MessageLoop methods in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 months 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_media_device_manager.h" 5 #include "content/renderer/pepper/pepper_media_device_manager.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const EnumerateDevicesCallback& callback) { 54 const EnumerateDevicesCallback& callback) {
55 enumerate_callbacks_[next_id_] = callback; 55 enumerate_callbacks_[next_id_] = callback;
56 int request_id = next_id_++; 56 int request_id = next_id_++;
57 57
58 #if defined(ENABLE_WEBRTC) 58 #if defined(ENABLE_WEBRTC)
59 GetMediaStreamDispatcher()->EnumerateDevices( 59 GetMediaStreamDispatcher()->EnumerateDevices(
60 request_id, AsWeakPtr(), 60 request_id, AsWeakPtr(),
61 PepperMediaDeviceManager::FromPepperDeviceType(type), 61 PepperMediaDeviceManager::FromPepperDeviceType(type),
62 url::Origin(document_url.GetOrigin())); 62 url::Origin(document_url.GetOrigin()));
63 #else 63 #else
64 base::MessageLoop::current()->PostTask( 64 base::ThreadTaskRunnerHandle::Get()->PostTask(
65 FROM_HERE, 65 FROM_HERE, base::Bind(&PepperMediaDeviceManager::OnDevicesEnumerated,
66 base::Bind(&PepperMediaDeviceManager::OnDevicesEnumerated, 66 AsWeakPtr(), request_id, StreamDeviceInfoArray()));
67 AsWeakPtr(),
68 request_id,
69 StreamDeviceInfoArray()));
70 #endif 67 #endif
71 68
72 return request_id; 69 return request_id;
73 } 70 }
74 71
75 void PepperMediaDeviceManager::StopEnumerateDevices(int request_id) { 72 void PepperMediaDeviceManager::StopEnumerateDevices(int request_id) {
76 enumerate_callbacks_.erase(request_id); 73 enumerate_callbacks_.erase(request_id);
77 74
78 #if defined(ENABLE_WEBRTC) 75 #if defined(ENABLE_WEBRTC)
79 // Need to post task since this function might be called inside the callback 76 // Need to post task since this function might be called inside the callback
(...skipping 22 matching lines...) Expand all
102 const OpenDeviceCallback& callback) { 99 const OpenDeviceCallback& callback) {
103 open_callbacks_[next_id_] = callback; 100 open_callbacks_[next_id_] = callback;
104 int request_id = next_id_++; 101 int request_id = next_id_++;
105 102
106 #if defined(ENABLE_WEBRTC) 103 #if defined(ENABLE_WEBRTC)
107 GetMediaStreamDispatcher()->OpenDevice( 104 GetMediaStreamDispatcher()->OpenDevice(
108 request_id, AsWeakPtr(), device_id, 105 request_id, AsWeakPtr(), device_id,
109 PepperMediaDeviceManager::FromPepperDeviceType(type), 106 PepperMediaDeviceManager::FromPepperDeviceType(type),
110 url::Origin(document_url.GetOrigin())); 107 url::Origin(document_url.GetOrigin()));
111 #else 108 #else
112 base::MessageLoop::current()->PostTask( 109 base::ThreadTaskRunnerHandle::Get()->PostTask(
113 FROM_HERE, 110 FROM_HERE, base::Bind(&PepperMediaDeviceManager::OnDeviceOpenFailed,
114 base::Bind(&PepperMediaDeviceManager::OnDeviceOpenFailed, 111 AsWeakPtr(), request_id));
115 AsWeakPtr(),
116 request_id));
117 #endif 112 #endif
118 113
119 return request_id; 114 return request_id;
120 } 115 }
121 116
122 void PepperMediaDeviceManager::CancelOpenDevice(int request_id) { 117 void PepperMediaDeviceManager::CancelOpenDevice(int request_id) {
123 open_callbacks_.erase(request_id); 118 open_callbacks_.erase(request_id);
124 119
125 #if defined(ENABLE_WEBRTC) 120 #if defined(ENABLE_WEBRTC)
126 GetMediaStreamDispatcher()->CancelOpenDevice(request_id, AsWeakPtr()); 121 GetMediaStreamDispatcher()->CancelOpenDevice(request_id, AsWeakPtr());
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 MediaStreamDispatcher* PepperMediaDeviceManager::GetMediaStreamDispatcher() 244 MediaStreamDispatcher* PepperMediaDeviceManager::GetMediaStreamDispatcher()
250 const { 245 const {
251 DCHECK(render_frame()); 246 DCHECK(render_frame());
252 MediaStreamDispatcher* const dispatcher = 247 MediaStreamDispatcher* const dispatcher =
253 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher(); 248 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher();
254 DCHECK(dispatcher); 249 DCHECK(dispatcher);
255 return dispatcher; 250 return dispatcher;
256 } 251 }
257 252
258 } // namespace content 253 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/peer_connection_dependency_factory.cc ('k') | content/renderer/pepper/pepper_webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698