MediaStream API: Patch #1 of implementing navigator.getMediaDevices

public/platform/WebMediaDeviceInfo.h

Index: public/platform/WebMediaDeviceInfo.h
diff --git a/public/platform/WebSourceInfo.h b/public/platform/WebMediaDeviceInfo.h
similarity index 63%
copy from public/platform/WebSourceInfo.h
copy to public/platform/WebMediaDeviceInfo.h
index 190b1e62d20486ebff6fdfb71b482003f926361f..6406f17aa5e4439931394a5a8db28a9df10ca326 100644
--- a/public/platform/WebSourceInfo.h
+++ b/public/platform/WebMediaDeviceInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebSourceInfo_h
-#define WebSourceInfo_h
+#ifndef WebMediaDeviceInfo_h
+#define WebMediaDeviceInfo_h
 
 #include "WebCommon.h"
 #include "WebNonCopyable.h"
@@ -33,47 +33,41 @@
 
 namespace blink {
 
-class WebSourceInfoPrivate;
+class WebMediaDeviceInfoPrivate;
 
-class WebSourceInfo {
+class WebMediaDeviceInfo {
 public:
-    enum SourceKind {
-        SourceKindNone,
-        SourceKindAudio,
-        SourceKindVideo
+    enum MediaDeviceKind {
+        MediaDeviceKindAudioInput,
+        MediaDeviceKindAudioOutput,
+        MediaDeviceKindVideoInput
     };
 
-    enum VideoFacingMode {
-        VideoFacingModeNone,
-        VideoFacingModeUser,
-        VideoFacingModeEnvironment
-    };
-
-    WebSourceInfo() { }
-    WebSourceInfo(const WebSourceInfo& other) { assign(other); }
-    ~WebSourceInfo() { reset(); }
+    WebMediaDeviceInfo() { }
+    WebMediaDeviceInfo(const WebMediaDeviceInfo& other) { assign(other); }
+    ~WebMediaDeviceInfo() { reset(); }
 
-    WebSourceInfo& operator=(const WebSourceInfo& other)
+    WebMediaDeviceInfo& operator=(const WebMediaDeviceInfo& other)
     {
         assign(other);
         return *this;
     }
 
-    BLINK_PLATFORM_EXPORT void assign(const WebSourceInfo&);
+    BLINK_PLATFORM_EXPORT void assign(const WebMediaDeviceInfo&);
 
-    BLINK_PLATFORM_EXPORT void initialize(const WebString& id, SourceKind, const WebString& label, VideoFacingMode);
+    BLINK_PLATFORM_EXPORT void initialize(const WebString& deviceId, MediaDeviceKind, const WebString& label, const WebString& groupId);
     BLINK_PLATFORM_EXPORT void reset();
     bool isNull() const { return m_private.isNull(); }
 
-    BLINK_PLATFORM_EXPORT WebString id() const;
-    BLINK_PLATFORM_EXPORT SourceKind kind() const;
+    BLINK_PLATFORM_EXPORT WebString deviceId() const;
+    BLINK_PLATFORM_EXPORT MediaDeviceKind kind() const;
     BLINK_PLATFORM_EXPORT WebString label() const;
-    BLINK_PLATFORM_EXPORT VideoFacingMode facing() const;
+    BLINK_PLATFORM_EXPORT WebString groupId() const;
 
 private:
-    WebPrivatePtr<WebSourceInfoPrivate> m_private;
+    WebPrivatePtr<WebMediaDeviceInfoPrivate> m_private;
 };
 
 } // namespace blink
 
-#endif // WebSourceInfo_h
+#endif // WebMediaDeviceInfo_h