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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/mediastream/NavigatorMediaStream.h ('k') | Source/core/mediastream/NavigatorMediaStream.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/mediastream/NavigatorMediaStream.cpp
diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/core/mediastream/NavigatorMediaStream.cpp
similarity index 88%
rename from Source/modules/mediastream/NavigatorMediaStream.cpp
rename to Source/core/mediastream/NavigatorMediaStream.cpp
index 3429c95b84219c58ab7ae5b6b6c6ea815654774a..e1916ec3315d750bf9fccd9c8d2ce24a15b35416 100644
--- a/Source/modules/mediastream/NavigatorMediaStream.cpp
+++ b/Source/core/mediastream/NavigatorMediaStream.cpp
@@ -21,7 +21,7 @@
*/
#include "config.h"
-#include "modules/mediastream/NavigatorMediaStream.h"
+#include "core/mediastream/NavigatorMediaStream.h"
#include "bindings/core/v8/Dictionary.h"
#include "bindings/core/v8/ExceptionState.h"
@@ -29,13 +29,13 @@
#include "core/dom/ExceptionCode.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/Navigator.h"
+#include "core/mediastream/MediaDeviceInfoCallback.h"
+#include "core/mediastream/MediaDevicesRequest.h"
+#include "core/mediastream/NavigatorUserMediaErrorCallback.h"
+#include "core/mediastream/NavigatorUserMediaSuccessCallback.h"
+#include "core/mediastream/UserMediaController.h"
+#include "core/mediastream/UserMediaRequest.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 {
« 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