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

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

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/deviceinfo.h ('k') | webrtc/media/devices/devicemanager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/devicemanager.h
diff --git a/talk/media/devices/devicemanager.h b/webrtc/media/devices/devicemanager.h
similarity index 95%
rename from talk/media/devices/devicemanager.h
rename to webrtc/media/devices/devicemanager.h
index 982c67953173023ee8408d0ec91f75cea965262d..932fc5b8f7ec88fb60035ac8f337fe7319eddcbf 100644
--- a/talk/media/devices/devicemanager.h
+++ b/webrtc/media/devices/devicemanager.h
@@ -25,21 +25,21 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_DEVICES_DEVICEMANAGER_H_
-#define TALK_MEDIA_DEVICES_DEVICEMANAGER_H_
+#ifndef WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
+#define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
#include <map>
#include <string>
#include <vector>
-#include "talk/media/base/device.h"
-#include "talk/media/base/screencastid.h"
-#include "talk/media/base/videocapturerfactory.h"
-#include "talk/media/base/videocommon.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/window.h"
+#include "webrtc/media/base/device.h"
+#include "webrtc/media/base/screencastid.h"
+#include "webrtc/media/base/videocapturerfactory.h"
+#include "webrtc/media/base/videocommon.h"
namespace rtc {
@@ -208,4 +208,4 @@ class DeviceManager : public DeviceManagerInterface {
} // namespace cricket
-#endif // TALK_MEDIA_DEVICES_DEVICEMANAGER_H_
+#endif // WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
« no previous file with comments | « webrtc/media/devices/deviceinfo.h ('k') | webrtc/media/devices/devicemanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698