| Index: trunk/src/media/video/capture/video_capture_device.h
|
| ===================================================================
|
| --- trunk/src/media/video/capture/video_capture_device.h (revision 235779)
|
| +++ trunk/src/media/video/capture/video_capture_device.h (working copy)
|
| @@ -18,7 +18,6 @@
|
| #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 {
|
| @@ -110,8 +109,15 @@
|
| };
|
|
|
| // Manages a list of Name entries.
|
| - typedef std::list<Name> Names;
|
| + 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.
|
| + };
|
| +
|
| class MEDIA_EXPORT Client {
|
| public:
|
| virtual ~Client() {}
|
|
|