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

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

Issue 15822010: Update refernces to Blink's Platform API (content) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
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_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/threading/non_thread_safe.h" 17 #include "base/threading/non_thread_safe.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/public/renderer/render_view_observer.h" 19 #include "content/public/renderer/render_view_observer.h"
20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" 20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
21 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" 21 #include "third_party/WebKit/public/platform/WebMediaStream.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h " 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h "
24 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 24 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
25 #include "webkit/media/media_stream_client.h" 25 #include "webkit/media/media_stream_client.h"
26 26
27 namespace webkit_media { 27 namespace webkit_media {
28 class MediaStreamAudioRenderer; 28 class MediaStreamAudioRenderer;
29 } 29 }
30 30
31 namespace content { 31 namespace content {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 MediaStreamDispatcher* media_stream_dispatcher_; 173 MediaStreamDispatcher* media_stream_dispatcher_;
174 174
175 UserMediaRequests user_media_requests_; 175 UserMediaRequests user_media_requests_;
176 176
177 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 177 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
178 }; 178 };
179 179
180 } // namespace content 180 } // namespace content
181 181
182 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 182 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_extra_data.h ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698