Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: trunk/src/media/video/capture/video_capture_device.h

Issue 61213006: Revert 235728 "Removed RunUntilIdle between Stop and Close in UT..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {}
« no previous file with comments | « trunk/src/media/video/capture/mac/video_capture_device_mac.mm ('k') | trunk/src/media/video/capture/video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698