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

Unified Diff: Source/modules/mediastream/MediaDeviceInfo.h

Issue 145583015: MediaStream API: Implement Navigator.getMediaDevices Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/mediastream/MediaDeviceInfo.h
diff --git a/Source/modules/mediastream/SourceInfo.h b/Source/modules/mediastream/MediaDeviceInfo.h
similarity index 72%
copy from Source/modules/mediastream/SourceInfo.h
copy to Source/modules/mediastream/MediaDeviceInfo.h
index 57349887efa01bd6e935d96241316944bc924b1c..6d2135271333b05d65195bab4ffd4741d85d3728 100644
--- a/Source/modules/mediastream/SourceInfo.h
+++ b/Source/modules/mediastream/MediaDeviceInfo.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,34 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SourceInfo_h
-#define SourceInfo_h
+#ifndef MediaDeviceInfo_h
+#define MediaDeviceInfo_h
#include "bindings/v8/ScriptWrappable.h"
-#include "public/platform/WebSourceInfo.h"
+#include "public/platform/WebMediaDeviceInfo.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
#include "wtf/Vector.h"
namespace WebCore {
-class SourceInfo : public RefCounted<SourceInfo>, public ScriptWrappable {
+class MediaDeviceInfo : public RefCounted<MediaDeviceInfo>, public ScriptWrappable {
public:
- static PassRefPtr<SourceInfo> create(const blink::WebSourceInfo&);
+ static PassRefPtr<MediaDeviceInfo> create(const blink::WebMediaDeviceInfo&);
- String id() const;
+ String deviceId() const;
String kind() const;
String label() const;
- String facing() const;
+ String groupId() const;
private:
- explicit SourceInfo(const blink::WebSourceInfo&);
+ explicit MediaDeviceInfo(const blink::WebMediaDeviceInfo&);
- blink::WebSourceInfo m_webSourceInfo;
+ blink::WebMediaDeviceInfo m_webMediaDeviceInfo;
};
-typedef Vector<RefPtr<SourceInfo> > SourceInfoVector;
+typedef Vector<RefPtr<MediaDeviceInfo> > MediaDeviceInfoVector;
} // namespace WebCore
-#endif // SourceInfo_h
+#endif // MediaDeviceInfo_h
« no previous file with comments | « no previous file | Source/modules/mediastream/MediaDeviceInfo.cpp » ('j') | Source/modules/mediastream/MediaDeviceInfo.idl » ('J')

Powered by Google App Engine
This is Rietveld 408576698