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

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

Issue 1543673002: MediaRecorder: make MediaRecorderHandler a MediaStreamObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added content_browsertests for Error Event firing when Track added/removed to MS Created 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_H_
7 7
8 #include <string>
9 #include <vector> 8 #include <vector>
10 9
11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
13 #include "base/macros.h" 11 #include "base/macros.h"
14 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
15 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
16 #include "third_party/WebKit/public/platform/WebMediaStream.h" 14 #include "third_party/WebKit/public/platform/WebMediaStream.h"
17 15
18 namespace content { 16 namespace content {
19 17
20 // MediaStreamObserver can be used to get notifications of when a track is 18 // MediaStreamObserver can be used to get notifications of when a track is
21 // added or removed from a MediaStream. 19 // added or removed from a MediaStream.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 private: 55 private:
58 base::ThreadChecker thread_checker_; 56 base::ThreadChecker thread_checker_;
59 std::vector<MediaStreamObserver*> observers_; 57 std::vector<MediaStreamObserver*> observers_;
60 58
61 DISALLOW_COPY_AND_ASSIGN(MediaStream); 59 DISALLOW_COPY_AND_ASSIGN(MediaStream);
62 }; 60 };
63 61
64 } // namespace content 62 } // namespace content
65 63
66 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_H_ 64 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_recorder_handler.cc ('k') | content/renderer/media/media_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698