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

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

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediastream/MediaDeviceInfo.h ('k') | Source/modules/mediastream/MediaDeviceInfo.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediastream/MediaDeviceInfo.cpp
diff --git a/Source/modules/mediastream/MediaDeviceInfo.cpp b/Source/modules/mediastream/MediaDeviceInfo.cpp
deleted file mode 100644
index e2ce78d28eea5614018bcd2d14d72c6c4d52b0e7..0000000000000000000000000000000000000000
--- a/Source/modules/mediastream/MediaDeviceInfo.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "modules/mediastream/MediaDeviceInfo.h"
-
-#include "wtf/text/WTFString.h"
-
-namespace blink {
-
-MediaDeviceInfo* MediaDeviceInfo::create(const WebMediaDeviceInfo& webMediaDeviceInfo)
-{
- ASSERT(!webMediaDeviceInfo.isNull());
- return new MediaDeviceInfo(webMediaDeviceInfo);
-}
-
-MediaDeviceInfo::MediaDeviceInfo(const WebMediaDeviceInfo& webMediaDeviceInfo)
- : m_webMediaDeviceInfo(webMediaDeviceInfo)
-{
-}
-
-String MediaDeviceInfo::deviceId() const
-{
- return m_webMediaDeviceInfo.deviceId();
-}
-
-String MediaDeviceInfo::kind() const
-{
- switch (m_webMediaDeviceInfo.kind()) {
- case WebMediaDeviceInfo::MediaDeviceKindAudioInput:
- return "audioinput";
- case WebMediaDeviceInfo::MediaDeviceKindAudioOutput:
- return "audiooutput";
- case WebMediaDeviceInfo::MediaDeviceKindVideoInput:
- return "videoinput";
- }
-
- ASSERT_NOT_REACHED();
- return String();
-}
-
-String MediaDeviceInfo::label() const
-{
- return m_webMediaDeviceInfo.label();
-}
-
-String MediaDeviceInfo::groupId() const
-{
- return m_webMediaDeviceInfo.groupId();
-}
-
-} // namespace blink
« no previous file with comments | « Source/modules/mediastream/MediaDeviceInfo.h ('k') | Source/modules/mediastream/MediaDeviceInfo.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698