| 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 {
|
|
|