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

Side by Side Diff: Source/core/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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Harri Porten (porten@kde.org) 2 * Copyright (C) 2000 Harri Porten (porten@kde.org)
3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) 3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) 4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Lesser General Public License for more details. 16 * Lesser General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Lesser General Public 18 * You should have received a copy of the GNU Lesser General Public
19 * License along with this library; if not, write to the Free Software 19 * License along with this library; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 U SA 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 U SA
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "modules/mediastream/NavigatorMediaStream.h" 24 #include "core/mediastream/NavigatorMediaStream.h"
25 25
26 #include "bindings/core/v8/Dictionary.h" 26 #include "bindings/core/v8/Dictionary.h"
27 #include "bindings/core/v8/ExceptionState.h" 27 #include "bindings/core/v8/ExceptionState.h"
28 #include "core/dom/Document.h" 28 #include "core/dom/Document.h"
29 #include "core/dom/ExceptionCode.h" 29 #include "core/dom/ExceptionCode.h"
30 #include "core/frame/LocalFrame.h" 30 #include "core/frame/LocalFrame.h"
31 #include "core/frame/Navigator.h" 31 #include "core/frame/Navigator.h"
32 #include "core/mediastream/MediaDeviceInfoCallback.h"
33 #include "core/mediastream/MediaDevicesRequest.h"
34 #include "core/mediastream/NavigatorUserMediaErrorCallback.h"
35 #include "core/mediastream/NavigatorUserMediaSuccessCallback.h"
36 #include "core/mediastream/UserMediaController.h"
37 #include "core/mediastream/UserMediaRequest.h"
32 #include "core/page/Page.h" 38 #include "core/page/Page.h"
33 #include "modules/mediastream/MediaDeviceInfoCallback.h"
34 #include "modules/mediastream/MediaDevicesRequest.h"
35 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
36 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
37 #include "modules/mediastream/UserMediaController.h"
38 #include "modules/mediastream/UserMediaRequest.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 NavigatorMediaStream::NavigatorMediaStream() 42 NavigatorMediaStream::NavigatorMediaStream()
43 { 43 {
44 } 44 }
45 45
46 NavigatorMediaStream::~NavigatorMediaStream() 46 NavigatorMediaStream::~NavigatorMediaStream()
47 { 47 {
48 } 48 }
(...skipping 30 matching lines...) Expand all
79 if (!request) { 79 if (!request) {
80 if (!exceptionState.hadException()) 80 if (!exceptionState.hadException())
81 exceptionState.throwDOMException(NotSupportedError, "Failed to reque st media devices."); 81 exceptionState.throwDOMException(NotSupportedError, "Failed to reque st media devices.");
82 return; 82 return;
83 } 83 }
84 84
85 request->start(); 85 request->start();
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/mediastream/NavigatorMediaStream.h ('k') | Source/core/mediastream/NavigatorMediaStream.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698