Media Related changes for TabCapture API

content/public/common/media_stream_request.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_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 
+// MediaStreamConstraint keys.

[perkj_chrome, 2012/10/04 08:19:25]

? This does not seem to have anything todo with constraints?

[perkj_chrome, 2012/10/04 08:24:59]

oh - I see. But media_stream_request.h is not used in the render process. Ie -
none of the types below are used. Move these to media_stream_options.h and
please add a comment about what it is.

[justinlin, 2012/10/08 08:59:45]

Done.

[justinlin, 2012/10/08 08:59:45]

Done.

[justinlin, 2012/10/08 18:50:03]

Actually, I need access to access these from chrome/, would it make sense to
move mode_stream_request.h into the public interface of content/? Or, should I
move these 2 constants back to media_stream_options?

+CONTENT_EXPORT extern const char kMediaStreamSource[];
+CONTENT_EXPORT extern const char kMediaStreamSourceId[];
+
 // Types of media streams.
 enum MediaStreamDeviceType {
   MEDIA_NO_SERVICE = 0,
 
   // A device provided by the operating system (e.g., webcam input).
   MEDIA_DEVICE_AUDIO_CAPTURE,
   MEDIA_DEVICE_VIDEO_CAPTURE,
 
   // Mirroring of a browser tab.
   MEDIA_TAB_AUDIO_CAPTURE,
@@ skipping 27 matching lines @@
   std::string name;
 };
 
 typedef std::vector<MediaStreamDevice> MediaStreamDevices;
 
 typedef std::map<MediaStreamDeviceType, MediaStreamDevices>
     MediaStreamDeviceMap;
 
 // Represents a request for media streams (audio/video).
 struct CONTENT_EXPORT MediaStreamRequest {
+
+  enum RequestState {
+    STATE_NOT_REQUESTED = 0,
+    STATE_REQUESTED,
+    STATE_PENDING_APPROVAL,
+    STATE_OPENING,
+    STATE_DONE,
+    STATE_ERROR
+  };
+
   MediaStreamRequest(
       int render_process_id,
       int render_view_id,
       const GURL& security_origin);
 
   ~MediaStreamRequest();
 
   // The render process id generating this request.
   int render_process_id;
 
   // The render view id generating this request.
   int render_view_id;
 
   // The WebKit security origin for the current request (e.g. "html5rocks.com").
   GURL security_origin;
 
   // A list of devices present on the user's computer, for each device type
   // requested.
   // All the elements in this map will be deleted in ~MediaStreamRequest().
   MediaStreamDeviceMap devices;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_