Media Related changes for TabCapture API

content/common/media/media_stream_options.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "content/common/content_export.h"
 #include "content/public/common/media_stream_request.h"
 
 namespace media_stream {
 
+// MediaStreamConstraint keys for constraints that are passed to getUserMedia.
+CONTENT_EXPORT extern const char kMediaStreamSource[];
+CONTENT_EXPORT extern const char kMediaStreamSourceId[];
+CONTENT_EXPORT extern const char kMediaStreamSourceTab[];
+
 typedef content::MediaStreamDeviceType MediaStreamType;
 
 // StreamOptions is a Chromium representation of WebKit's
 // WebUserMediaRequest Options. It describes the components
 // in a request for a new media stream.
 struct CONTENT_EXPORT StreamOptions {
   StreamOptions();
   // TODO(miu): Remove the 2-bools ctor in later clean-up CL.
   StreamOptions(bool user_audio, bool user_video);

[perkj_chrome, 2012/10/12 13:22:05]

unused? Remove this.

[justinlin, 2012/10/12 20:04:20]

There's too many tests to update. I'll do it in a follow-up CL.

   StreamOptions(MediaStreamType audio_type, MediaStreamType video_type);

[perkj_chrome, 2012/10/12 13:22:05]

Is this one necessary? Seems like default constructor can be used instead if I
only look in MediaStreamImpl.

[justinlin, 2012/10/12 20:04:20]

Done.

+  StreamOptions(MediaStreamType audio_type, std::string audio_device_id,

[perkj_chrome, 2012/10/12 13:22:05]

Not used in MediaStreamImpl. Remove?

[justinlin, 2012/10/12 20:04:20]

Done.

+                MediaStreamType video_type, std::string video_device_id);
 
   // If not NO_SERVICE, the stream shall contain an audio input stream.
   MediaStreamType audio_type;
+  std::string audio_device_id;
 
   // If not NO_SERVICE, the stream shall contain a video input stream.
   MediaStreamType video_type;
+  std::string video_device_id;
 };
 
 // StreamDeviceInfo describes information about a device.
 struct CONTENT_EXPORT StreamDeviceInfo {
   static const int kNoId;
 
   StreamDeviceInfo();
   StreamDeviceInfo(MediaStreamType service_param,
                    const std::string& name_param,
                    const std::string& device_param,
@@ skipping 12 matching lines @@
   bool in_use;
   // Id for this capture session. Unique for all sessions of the same type.
   int session_id;
 };
 
 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
 
 }  // namespace media_stream
 
 #endif  // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_