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

Side by Side Diff: content/public/common/media_stream_request.cc

Issue 795703003: Don't auto allow access to media devices unless a the security origin of the requester is the same … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win compile. Created 5 years, 11 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/public/common/media_stream_request.h" 5 #include "content/public/common/media_stream_request.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (iter->id == device_id) 80 if (iter->id == device_id)
81 return &(*iter); 81 return &(*iter);
82 } 82 }
83 return NULL; 83 return NULL;
84 } 84 }
85 85
86 MediaStreamRequest::MediaStreamRequest( 86 MediaStreamRequest::MediaStreamRequest(
87 int render_process_id, 87 int render_process_id,
88 int render_frame_id, 88 int render_frame_id,
89 int page_request_id, 89 int page_request_id,
90 const std::string& tab_capture_device_id,
90 const GURL& security_origin, 91 const GURL& security_origin,
91 bool user_gesture, 92 bool user_gesture,
92 MediaStreamRequestType request_type, 93 MediaStreamRequestType request_type,
93 const std::string& requested_audio_device_id, 94 const std::string& requested_audio_device_id,
94 const std::string& requested_video_device_id, 95 const std::string& requested_video_device_id,
95 MediaStreamType audio_type, 96 MediaStreamType audio_type,
96 MediaStreamType video_type) 97 MediaStreamType video_type)
97 : render_process_id(render_process_id), 98 : render_process_id(render_process_id),
98 render_frame_id(render_frame_id), 99 render_frame_id(render_frame_id),
99 page_request_id(page_request_id), 100 page_request_id(page_request_id),
101 tab_capture_device_id(tab_capture_device_id),
100 security_origin(security_origin), 102 security_origin(security_origin),
101 user_gesture(user_gesture), 103 user_gesture(user_gesture),
102 request_type(request_type), 104 request_type(request_type),
103 requested_audio_device_id(requested_audio_device_id), 105 requested_audio_device_id(requested_audio_device_id),
104 requested_video_device_id(requested_video_device_id), 106 requested_video_device_id(requested_video_device_id),
105 audio_type(audio_type), 107 audio_type(audio_type),
106 video_type(video_type) { 108 video_type(video_type),
109 all_ancestors_have_same_origin(false) {
107 } 110 }
108 111
109 MediaStreamRequest::~MediaStreamRequest() {} 112 MediaStreamRequest::~MediaStreamRequest() {}
110 113
111 } // namespace content 114 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698