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

Side by Side Diff: content/renderer/media/media_stream_center.h

Issue 10038009: Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_center.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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 20 matching lines...) Expand all
31 virtual void didDisableMediaStreamTrack( 31 virtual void didDisableMediaStreamTrack(
32 const WebKit::WebMediaStreamDescriptor& stream, 32 const WebKit::WebMediaStreamDescriptor& stream,
33 const WebKit::WebMediaStreamComponent& component) OVERRIDE; 33 const WebKit::WebMediaStreamComponent& component) OVERRIDE;
34 34
35 virtual void didStopLocalMediaStream( 35 virtual void didStopLocalMediaStream(
36 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 36 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
37 37
38 virtual void didConstructMediaStream( 38 virtual void didConstructMediaStream(
39 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 39 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
40 40
41 virtual WebKit::WebString constructSDP(
42 const WebKit::WebICECandidateDescriptor& candidate) OVERRIDE;
43
44 virtual WebKit::WebString constructSDP(
45 const WebKit::WebSessionDescriptionDescriptor& description) OVERRIDE;
46
47 private: 41 private:
48 // Weak pointer, owned by WebKit. 42 // Weak pointer, owned by WebKit.
49 WebKit::WebMediaStreamCenterClient* client_; 43 WebKit::WebMediaStreamCenterClient* client_;
50 44
51 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter); 45 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter);
52 }; 46 };
53 47
54 } // namespace content 48 } // namespace content
55 49
56 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 50 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698