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

Unified Diff: webrtc/media/devices/devicemanager.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « webrtc/media/devices/devicemanager.h ('k') | webrtc/media/devices/devicemanager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/devicemanager.cc
diff --git a/talk/media/devices/devicemanager.cc b/webrtc/media/devices/devicemanager.cc
similarity index 96%
rename from talk/media/devices/devicemanager.cc
rename to webrtc/media/devices/devicemanager.cc
index eca14a5def28d918e1447ccc95f51c765cd30fb3..a3f34fd02fae68bf71902b2b86ae6e85a162cd02 100644
--- a/talk/media/devices/devicemanager.cc
+++ b/webrtc/media/devices/devicemanager.cc
@@ -25,13 +25,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "talk/media/devices/devicemanager.h"
+#include "webrtc/media/devices/devicemanager.h"
-#include "talk/media/base/mediacommon.h"
-#include "talk/media/base/videocapturerfactory.h"
-#include "talk/media/devices/deviceinfo.h"
-#include "talk/media/devices/filevideocapturer.h"
-#include "talk/media/devices/yuvframescapturer.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/pathutils.h"
@@ -39,9 +34,14 @@
#include "webrtc/base/thread.h"
#include "webrtc/base/windowpicker.h"
#include "webrtc/base/windowpickerfactory.h"
+#include "webrtc/media/base/mediacommon.h"
+#include "webrtc/media/base/videocapturerfactory.h"
+#include "webrtc/media/devices/deviceinfo.h"
+#include "webrtc/media/devices/filevideocapturer.h"
+#include "webrtc/media/devices/yuvframescapturer.h"
#ifdef HAVE_WEBRTC_VIDEO
-#include "talk/media/webrtc/webrtcvideocapturerfactory.h"
+#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
#endif // HAVE_WEBRTC_VIDEO
namespace {
« no previous file with comments | « webrtc/media/devices/devicemanager.h ('k') | webrtc/media/devices/devicemanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698