| Index: Source/modules/mediastream/NavigatorMediaStream.cpp
|
| diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| index 63fc6a0b288f0b4b9f70c287c4ccdadfc4a5409f..b650a63eb54ac76458ef58e32183b23d9f90c618 100644
|
| --- a/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| +++ b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| @@ -32,7 +32,6 @@
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/UseCounter.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"
|
| @@ -81,22 +80,4 @@ void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
|
| 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
|
|
|