| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index 2d0a56f192fa656e46d739d8ba02b981ad3b45c5..a21a4a8608224f72190f1dfa33856b58590d958f 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -41,6 +41,8 @@
|
| #include "content/common/media/media_stream_options.h"
|
| #include "content/public/browser/media_request_state.h"
|
| #include "content/public/browser/resource_context.h"
|
| +#include "ui/gfx/display.h"
|
| +#include "ui/gfx/display_observer.h"
|
|
|
| namespace media {
|
| class AudioManager;
|
| @@ -62,7 +64,8 @@ class CONTENT_EXPORT MediaStreamManager
|
| : public MediaStreamProviderListener,
|
| public base::MessageLoop::DestructionObserver,
|
| public base::PowerObserver,
|
| - public base::SystemMonitor::DevicesChangedObserver {
|
| + public base::SystemMonitor::DevicesChangedObserver,
|
| + public gfx::DisplayObserver {
|
| public:
|
| // Callback to deliver the result of a media request.
|
| typedef base::Callback<void(const MediaStreamDevices& devices,
|
| @@ -351,6 +354,13 @@ class CONTENT_EXPORT MediaStreamManager
|
| StreamDeviceInfoArray devices,
|
| gfx::NativeViewId window_id);
|
|
|
| + // gfx::DisplayObserver:
|
| + virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
|
| + virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
|
| + virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
|
| +
|
| + void SetDisplayRotationOnIOThread(gfx::Display::Rotation rotation);
|
| +
|
| // Task runner shared by VideoCaptureManager and AudioInputDeviceManager.
|
| // Note: Enumeration tasks may take seconds to complete so must never be run
|
| // on any of the BrowserThreads (UI, IO, etc). See http://crbug.com/256945.
|
| @@ -379,6 +389,7 @@ class CONTENT_EXPORT MediaStreamManager
|
| // managers on the right thread.
|
| base::MessageLoop* io_loop_;
|
|
|
| + bool observing_screen_;
|
| bool use_fake_ui_;
|
| scoped_ptr<FakeMediaStreamUIProxy> fake_ui_;
|
|
|
|
|