| Index: media/video/capture/video_capture_device.h
|
| diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
|
| index 2e60256a8f121f232b950e750391ac640b9e8484..94db54e966254ea7b72ae28a829dd72e2f0c85b6 100644
|
| --- a/media/video/capture/video_capture_device.h
|
| +++ b/media/video/capture/video_capture_device.h
|
| @@ -18,6 +18,7 @@
|
| #include "base/logging.h"
|
| #include "base/time/time.h"
|
| #include "media/base/media_export.h"
|
| +#include "media/base/video_frame.h"
|
| #include "media/video/capture/video_capture_types.h"
|
|
|
| namespace media {
|
| @@ -109,14 +110,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
|
| };
|
|
|
| // Manages a list of Name entries.
|
| - class MEDIA_EXPORT Names
|
| - : public NON_EXPORTED_BASE(std::list<Name>) {
|
| - public:
|
| - // Returns NULL if no entry was found by that ID.
|
| - Name* FindById(const std::string& id);
|
| -
|
| - // Allow generated copy constructor and assignment.
|
| - };
|
| + typedef std::list<Name> Names;
|
|
|
| class MEDIA_EXPORT Client {
|
| public:
|
|
|