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