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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1928493002: Use url::Origin to represent security origins in MediaStream-related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « content/renderer/media/user_media_client_impl.cc ('k') | extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 int PepperMediaDeviceManager::EnumerateDevices( 51 int PepperMediaDeviceManager::EnumerateDevices(
52 PP_DeviceType_Dev type, 52 PP_DeviceType_Dev type,
53 const GURL& document_url, 53 const GURL& document_url,
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, 60 request_id, AsWeakPtr(),
61 AsWeakPtr(),
62 PepperMediaDeviceManager::FromPepperDeviceType(type), 61 PepperMediaDeviceManager::FromPepperDeviceType(type),
63 document_url.GetOrigin()); 62 url::Origin(document_url.GetOrigin()));
64 #else 63 #else
65 base::MessageLoop::current()->PostTask( 64 base::MessageLoop::current()->PostTask(
66 FROM_HERE, 65 FROM_HERE,
67 base::Bind(&PepperMediaDeviceManager::OnDevicesEnumerated, 66 base::Bind(&PepperMediaDeviceManager::OnDevicesEnumerated,
68 AsWeakPtr(), 67 AsWeakPtr(),
69 request_id, 68 request_id,
70 StreamDeviceInfoArray())); 69 StreamDeviceInfoArray()));
71 #endif 70 #endif
72 71
73 return request_id; 72 return request_id;
(...skipping 25 matching lines...) Expand all
99 98
100 int PepperMediaDeviceManager::OpenDevice(PP_DeviceType_Dev type, 99 int PepperMediaDeviceManager::OpenDevice(PP_DeviceType_Dev type,
101 const std::string& device_id, 100 const std::string& device_id,
102 const GURL& document_url, 101 const GURL& document_url,
103 const OpenDeviceCallback& callback) { 102 const OpenDeviceCallback& callback) {
104 open_callbacks_[next_id_] = callback; 103 open_callbacks_[next_id_] = callback;
105 int request_id = next_id_++; 104 int request_id = next_id_++;
106 105
107 #if defined(ENABLE_WEBRTC) 106 #if defined(ENABLE_WEBRTC)
108 GetMediaStreamDispatcher()->OpenDevice( 107 GetMediaStreamDispatcher()->OpenDevice(
109 request_id, 108 request_id, AsWeakPtr(), device_id,
110 AsWeakPtr(),
111 device_id,
112 PepperMediaDeviceManager::FromPepperDeviceType(type), 109 PepperMediaDeviceManager::FromPepperDeviceType(type),
113 document_url.GetOrigin()); 110 url::Origin(document_url.GetOrigin()));
114 #else 111 #else
115 base::MessageLoop::current()->PostTask( 112 base::MessageLoop::current()->PostTask(
116 FROM_HERE, 113 FROM_HERE,
117 base::Bind(&PepperMediaDeviceManager::OnDeviceOpenFailed, 114 base::Bind(&PepperMediaDeviceManager::OnDeviceOpenFailed,
118 AsWeakPtr(), 115 AsWeakPtr(),
119 request_id)); 116 request_id));
120 #endif 117 #endif
121 118
122 return request_id; 119 return request_id;
123 } 120 }
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 MediaStreamDispatcher* PepperMediaDeviceManager::GetMediaStreamDispatcher() 247 MediaStreamDispatcher* PepperMediaDeviceManager::GetMediaStreamDispatcher()
251 const { 248 const {
252 DCHECK(render_frame()); 249 DCHECK(render_frame());
253 MediaStreamDispatcher* const dispatcher = 250 MediaStreamDispatcher* const dispatcher =
254 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher(); 251 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher();
255 DCHECK(dispatcher); 252 DCHECK(dispatcher);
256 return dispatcher; 253 return dispatcher;
257 } 254 }
258 255
259 } // namespace content 256 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/user_media_client_impl.cc ('k') | extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698