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

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

Issue 391703002: Implement ConstraintNotSatisfiedError for getusermedia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and change the reviewers list Created 6 years, 4 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_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "content/common/media/media_stream_options.h" 12 #include "content/common/media/media_stream_options.h"
13 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 13 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
14 14
15 namespace blink { 15 namespace blink {
16 class WebMediaStreamTrack; 16 class WebMediaStreamTrack;
17 } // namespace blink 17 } // namespace blink
18 18
19 namespace content { 19 namespace content {
20 20
21 class CONTENT_EXPORT MediaStreamSource 21 class CONTENT_EXPORT MediaStreamSource
22 : NON_EXPORTED_BASE(public blink::WebMediaStreamSource::ExtraData) { 22 : NON_EXPORTED_BASE(public blink::WebMediaStreamSource::ExtraData) {
23 public: 23 public:
24 typedef base::Callback<void(const blink::WebMediaStreamSource& source)> 24 typedef base::Callback<void(const blink::WebMediaStreamSource& source)>
25 SourceStoppedCallback; 25 SourceStoppedCallback;
26 26
27 typedef base::Callback<void(MediaStreamSource* source, 27 typedef base::Callback<void(MediaStreamSource* source,
28 bool success)> ConstraintsCallback; 28 MediaStreamRequestResult result,
29 const blink::WebString& result_name)>
30 ConstraintsCallback;
29 31
30 // Source constraints key for 32 // Source constraints key for
31 // http://dev.w3.org/2011/webrtc/editor/getusermedia.html. 33 // http://dev.w3.org/2011/webrtc/editor/getusermedia.html.
32 static const char kSourceId[]; 34 static const char kSourceId[];
33 35
34 MediaStreamSource(); 36 MediaStreamSource();
35 virtual ~MediaStreamSource(); 37 virtual ~MediaStreamSource();
36 38
37 // Returns device information about a source that has been created by a 39 // Returns device information about a source that has been created by a
38 // JavaScript call to GetUserMedia, e.g., a camera or microphone. 40 // JavaScript call to GetUserMedia, e.g., a camera or microphone.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 private: 72 private:
71 StreamDeviceInfo device_info_; 73 StreamDeviceInfo device_info_;
72 SourceStoppedCallback stop_callback_; 74 SourceStoppedCallback stop_callback_;
73 75
74 DISALLOW_COPY_AND_ASSIGN(MediaStreamSource); 76 DISALLOW_COPY_AND_ASSIGN(MediaStreamSource);
75 }; 77 };
76 78
77 } // namespace content 79 } // namespace content
78 80
79 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_H_ 81 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698