Chromium Code Reviews| Index: media/cast/cast_environment.h |
| diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h |
| index 112909173595215479ab91353d87c9abcd625ebb..7f9ce1bf4c7de299f61e314acd90d0d9d60c268f 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, |
|
Alpha Left Google
2013/11/14 00:29:24
These shouldn't be boolean but method to enable ad
mikhal
2013/11/14 17:42:31
As a design choice, throughout cast we set all par
|
| + 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,9 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> { |
| bool CurrentlyOn(ThreadId identifier); |
| - base::TickClock* Clock(); |
| + base::TickClock* const Clock() const; |
| + |
| + LoggingImpl* const Logging(); |
|
Alpha Left Google
2013/11/14 00:29:24
LoggingImpl is not thread safe. Can you add a comm
mikhal
2013/11/14 17:42:31
Done.
|
| protected: |
| virtual ~CastEnvironment(); |
| @@ -74,6 +80,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); |
| }; |