| Index: webrtc/media/base/capturemanager.h
|
| diff --git a/talk/media/base/capturemanager.h b/webrtc/media/base/capturemanager.h
|
| similarity index 95%
|
| rename from talk/media/base/capturemanager.h
|
| rename to webrtc/media/base/capturemanager.h
|
| index 9f3c2086ffd47be6d42b8137c07a4004c66d1043..4994d6a95e1caf72efba2a54b76b81e00ba0f92a 100644
|
| --- a/talk/media/base/capturemanager.h
|
| +++ b/webrtc/media/base/capturemanager.h
|
| @@ -38,16 +38,16 @@
|
| // thread which is normally a separate unmarshalled thread and thus normally
|
| // require lock protection.
|
|
|
| -#ifndef TALK_MEDIA_BASE_CAPTUREMANAGER_H_
|
| -#define TALK_MEDIA_BASE_CAPTUREMANAGER_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
|
| +#define WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
|
|
|
| #include <map>
|
| #include <vector>
|
|
|
| -#include "talk/media/base/capturerenderadapter.h"
|
| -#include "talk/media/base/videocommon.h"
|
| #include "webrtc/base/sigslotrepeater.h"
|
| #include "webrtc/base/thread_checker.h"
|
| +#include "webrtc/media/base/capturerenderadapter.h"
|
| +#include "webrtc/media/base/videocommon.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -105,4 +105,4 @@ class CaptureManager : public sigslot::has_slots<> {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_BASE_CAPTUREMANAGER_H_
|
| +#endif // WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
|
|
|