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

Side by Side Diff: content/renderer/media/user_media_client_impl.cc

Issue 2710213005: Revert of Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Created 3 years, 9 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/media/user_media_client_impl.h" 5 #include "content/renderer/media/user_media_client_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 return *existing_source; 984 return *existing_source;
985 } 985 }
986 986
987 blink::WebMediaStreamSource::Type type = 987 blink::WebMediaStreamSource::Type type =
988 IsAudioInputMediaType(device.device.type) 988 IsAudioInputMediaType(device.device.type)
989 ? blink::WebMediaStreamSource::TypeAudio 989 ? blink::WebMediaStreamSource::TypeAudio
990 : blink::WebMediaStreamSource::TypeVideo; 990 : blink::WebMediaStreamSource::TypeVideo;
991 991
992 blink::WebMediaStreamSource source; 992 blink::WebMediaStreamSource source;
993 source.initialize(blink::WebString::fromUTF8(device.device.id), type, 993 source.initialize(blink::WebString::fromUTF8(device.device.id), type,
994 blink::WebString::fromUTF8(device.device.name)); 994 blink::WebString::fromUTF8(device.device.name),
995 false /* remote */);
995 996
996 DVLOG(1) << "Initialize source object :" 997 DVLOG(1) << "Initialize source object :"
997 << "id = " << source.id().utf8() 998 << "id = " << source.id().utf8()
998 << ", name = " << source.name().utf8(); 999 << ", name = " << source.name().utf8();
999 return source; 1000 return source;
1000 } 1001 }
1001 1002
1002 bool UserMediaClientImpl::RemoveLocalSource( 1003 bool UserMediaClientImpl::RemoveLocalSource(
1003 const blink::WebMediaStreamSource& source) { 1004 const blink::WebMediaStreamSource& source) {
1004 DCHECK(CalledOnValidThread()); 1005 DCHECK(CalledOnValidThread());
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 sources_waiting_for_callback_.end(), source); 1242 sources_waiting_for_callback_.end(), source);
1242 if (found != sources_waiting_for_callback_.end()) 1243 if (found != sources_waiting_for_callback_.end())
1243 OnTrackStarted(source, result, result_name); 1244 OnTrackStarted(source, result, result_name);
1244 } 1245 }
1245 1246
1246 void UserMediaClientImpl::OnDestruct() { 1247 void UserMediaClientImpl::OnDestruct() {
1247 delete this; 1248 delete this;
1248 } 1249 }
1249 1250
1250 } // namespace content 1251 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698