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

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

Issue 11734027: Roll libjingle 254:257 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | content/renderer/media/rtc_peer_connection_handler.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/media/mock_media_stream_dependency_factory.h" 5 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/mock_peer_connection_impl.h" 8 #include "content/renderer/media/mock_peer_connection_impl.h"
9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h" 10 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 video_tracks_->AddTrack(track); 63 video_tracks_->AddTrack(track);
64 return true; 64 return true;
65 } 65 }
66 virtual std::string label() const OVERRIDE { return label_; } 66 virtual std::string label() const OVERRIDE { return label_; }
67 virtual webrtc::AudioTracks* audio_tracks() OVERRIDE { 67 virtual webrtc::AudioTracks* audio_tracks() OVERRIDE {
68 return audio_tracks_; 68 return audio_tracks_;
69 } 69 }
70 virtual webrtc::VideoTracks* video_tracks() OVERRIDE { 70 virtual webrtc::VideoTracks* video_tracks() OVERRIDE {
71 return video_tracks_; 71 return video_tracks_;
72 } 72 }
73 virtual ReadyState ready_state() const OVERRIDE {
74 NOTIMPLEMENTED();
75 return kInitializing;
76 }
77 virtual void set_ready_state(ReadyState state) OVERRIDE { NOTIMPLEMENTED(); }
78 virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE { 73 virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE {
79 NOTIMPLEMENTED(); 74 NOTIMPLEMENTED();
80 } 75 }
81 virtual void UnregisterObserver(ObserverInterface* observer) { 76 virtual void UnregisterObserver(ObserverInterface* observer) {
82 NOTIMPLEMENTED(); 77 NOTIMPLEMENTED();
83 } 78 }
84 79
85 protected: 80 protected:
86 virtual ~MockLocalMediaStream() {} 81 virtual ~MockLocalMediaStream() {}
87 82
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 const std::string& sdp_mid, 394 const std::string& sdp_mid,
400 int sdp_mline_index, 395 int sdp_mline_index,
401 const std::string& sdp) { 396 const std::string& sdp) {
402 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp); 397 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp);
403 } 398 }
404 399
405 void MockMediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) { 400 void MockMediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) {
406 } 401 }
407 402
408 } // namespace content 403 } // namespace content
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698