| Index: media/tools/player_wtl/movie.h
|
| diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
|
| index e505165e6b1e12577001ee3b71c1a983ab70bfa2..581a0db5bbb9aeb1235a31aa033fcf23e02ba512 100644
|
| --- a/media/tools/player_wtl/movie.h
|
| +++ b/media/tools/player_wtl/movie.h
|
| @@ -11,17 +11,20 @@
|
|
|
| #include "base/ref_counted.h"
|
| #include "base/scoped_ptr.h"
|
| -#include "base/singleton.h"
|
| #include "base/thread.h"
|
|
|
| +template <typename T> struct DefaultSingletonTraits;
|
| class WtlVideoRenderer;
|
|
|
| namespace media {
|
|
|
| class PipelineImpl;
|
|
|
| -class Movie : public Singleton<Movie> {
|
| +class Movie {
|
| public:
|
| + // Returns the singleton instance.
|
| + static Movie* GetInstance();
|
| +
|
| // Open a movie.
|
| bool Open(const wchar_t* url, WtlVideoRenderer* video_renderer);
|
|
|
|
|