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

Side by Side Diff: content/common/media/media_stream_options.cc

Issue 10928043: Media Related changes for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename REQUEST_*->MEDIA_REQUEST_* Created 8 years, 2 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 #include "content/common/media/media_stream_options.h" 5 #include "content/common/media/media_stream_options.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media_stream { 9 namespace media_stream {
10 10
11 const char kMediaStreamSource[] = "chromeMediaSource";
12 const char kMediaStreamSourceId[] = "chromeMediaSourceId";
13 const char kMediaStreamSourceTab[] = "tab";
14
11 StreamOptions::StreamOptions() 15 StreamOptions::StreamOptions()
12 : audio_type(content::MEDIA_NO_SERVICE), 16 : audio_type(content::MEDIA_NO_SERVICE),
13 video_type(content::MEDIA_NO_SERVICE) {} 17 video_type(content::MEDIA_NO_SERVICE) {}
14 18
15 StreamOptions::StreamOptions(bool user_audio, bool user_video) 19 StreamOptions::StreamOptions(bool user_audio, bool user_video)
16 : audio_type(user_audio ? 20 : audio_type(user_audio ?
17 content::MEDIA_DEVICE_AUDIO_CAPTURE : 21 content::MEDIA_DEVICE_AUDIO_CAPTURE :
18 content::MEDIA_NO_SERVICE), 22 content::MEDIA_NO_SERVICE),
19 video_type(user_video ? 23 video_type(user_video ?
20 content::MEDIA_DEVICE_VIDEO_CAPTURE : 24 content::MEDIA_DEVICE_VIDEO_CAPTURE :
(...skipping 30 matching lines...) Expand all
51 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, 55 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
52 const StreamDeviceInfo& second) { 56 const StreamDeviceInfo& second) {
53 return first.stream_type == second.stream_type && 57 return first.stream_type == second.stream_type &&
54 first.name == second.name && 58 first.name == second.name &&
55 first.device_id == second.device_id && 59 first.device_id == second.device_id &&
56 first.in_use == second.in_use && 60 first.in_use == second.in_use &&
57 first.session_id == second.session_id; 61 first.session_id == second.session_id;
58 } 62 }
59 63
60 } // namespace media_stream 64 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698