| Index: media/cast/cast_environment.h
|
| diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h
|
| index 112909173595215479ab91353d87c9abcd625ebb..c66a65b47a900373ed4d5bf4435e80d3451f86d6 100644
|
| --- a/media/cast/cast_environment.h
|
| +++ b/media/cast/cast_environment.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/task_runner.h"
|
| #include "base/time/tick_clock.h"
|
| #include "base/time/time.h"
|
| +#include "media/cast/logging/logging_impl.h"
|
|
|
| namespace media {
|
| namespace cast {
|
| @@ -38,7 +39,10 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
|
| scoped_refptr<base::TaskRunner> audio_encode_thread_proxy,
|
| scoped_refptr<base::TaskRunner> audio_decode_thread_proxy,
|
| scoped_refptr<base::TaskRunner> video_encode_thread_proxy,
|
| - scoped_refptr<base::TaskRunner> video_decode_thread_proxy);
|
| + scoped_refptr<base::TaskRunner> video_decode_thread_proxy,
|
| + bool enable_data_collection,
|
| + bool enable_uma_stats,
|
| + bool enable_tracing);
|
|
|
| // These are the same methods in message_loop.h, but are guaranteed to either
|
| // get posted to the MessageLoop if it's still alive, or be deleted otherwise.
|
| @@ -56,7 +60,10 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
|
|
|
| bool CurrentlyOn(ThreadId identifier);
|
|
|
| - base::TickClock* Clock();
|
| + base::TickClock* Clock() const;
|
| +
|
| + // Logging is not thread safe. Should always be called from the main thread.
|
| + LoggingImpl* Logging();
|
|
|
| protected:
|
| virtual ~CastEnvironment();
|
| @@ -74,6 +81,8 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
|
| scoped_refptr<base::TaskRunner> video_encode_thread_proxy_;
|
| scoped_refptr<base::TaskRunner> video_decode_thread_proxy_;
|
|
|
| + scoped_ptr<LoggingImpl> logging_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CastEnvironment);
|
| };
|
|
|
|
|