| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index e5dd42afa20549ee29afd3abf64aa8d104629dda..180c7c631f5dc937c07d511c7a7749cd05805881 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -19,6 +19,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| #include "ui/aura/client/activation_change_observer.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/base/ui_base_types.h"
|
| @@ -162,7 +163,8 @@ class ShellTestApi;
|
| class ASH_EXPORT Shell
|
| : public internal::SystemModalContainerEventFilterDelegate,
|
| public ui::EventTarget,
|
| - public aura::client::ActivationChangeObserver {
|
| + public aura::client::ActivationChangeObserver,
|
| + public MediaCaptureDevicesDispatcher::Observer {
|
| public:
|
| typedef std::vector<internal::RootWindowController*> RootWindowControllerList;
|
|
|
| @@ -571,6 +573,12 @@ class ASH_EXPORT Shell
|
| virtual void OnWindowActivated(aura::Window* gained_active,
|
| aura::Window* lost_active) OVERRIDE;
|
|
|
| + // Overridden from MediaCaptureDevicesDispatcher::Observer:
|
| + virtual void OnRequestUpdate(int render_process_id,
|
| + int render_view_id,
|
| + const content::MediaStreamDevice& device,
|
| + const content::MediaRequestState state) OVERRIDE;
|
| +
|
| static Shell* instance_;
|
|
|
| // If set before the Shell is initialized, the mouse cursor will be hidden
|
|
|