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

Unified Diff: Source/modules/mediastream/NavigatorMediaStream.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
Index: Source/modules/mediastream/NavigatorMediaStream.cpp
diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/modules/mediastream/NavigatorMediaStream.cpp
deleted file mode 100644
index 3429c95b84219c58ab7ae5b6b6c6ea815654774a..0000000000000000000000000000000000000000
--- a/Source/modules/mediastream/NavigatorMediaStream.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2000 Harri Porten (porten@kde.org)
- * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
- * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "modules/mediastream/NavigatorMediaStream.h"
-
-#include "bindings/core/v8/Dictionary.h"
-#include "bindings/core/v8/ExceptionState.h"
-#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
-#include "core/frame/LocalFrame.h"
-#include "core/frame/Navigator.h"
-#include "core/page/Page.h"
-#include "modules/mediastream/MediaDeviceInfoCallback.h"
-#include "modules/mediastream/MediaDevicesRequest.h"
-#include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
-#include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
-#include "modules/mediastream/UserMediaController.h"
-#include "modules/mediastream/UserMediaRequest.h"
-
-namespace blink {
-
-NavigatorMediaStream::NavigatorMediaStream()
-{
-}
-
-NavigatorMediaStream::~NavigatorMediaStream()
-{
-}
-
-void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
-{
- if (!successCallback)
- return;
-
- UserMediaController* userMedia = UserMediaController::from(navigator.frame());
- if (!userMedia) {
- exceptionState.throwDOMException(NotSupportedError, "No user media controller available; is this a detached window?");
- return;
- }
-
- UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
- if (!request) {
- ASSERT(exceptionState.hadException());
- return;
- }
-
- request->start();
-}
-
-void NavigatorMediaStream::getMediaDevices(Navigator& navigator, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
-{
- UserMediaController* userMedia = UserMediaController::from(navigator.frame());
- if (!userMedia) {
- exceptionState.throwDOMException(NotSupportedError, "No media device controller available; is this a detached window?");
- return;
- }
-
- MediaDevicesRequest* request = MediaDevicesRequest::create(navigator.frame()->document(), userMedia, callback, exceptionState);
- if (!request) {
- if (!exceptionState.hadException())
- exceptionState.throwDOMException(NotSupportedError, "Failed to request media devices.");
- return;
- }
-
- request->start();
-}
-
-} // namespace blink
« no previous file with comments | « Source/modules/mediastream/NavigatorMediaStream.h ('k') | Source/modules/mediastream/NavigatorMediaStream.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698