Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3161)

Unified Diff: ash/shell.h

Issue 139053003: Chrome OS: avoid suspending on lid close when casting is active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove dependencies of chrome in chromeos. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/DEPS ('K') | « ash/DEPS ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« ash/DEPS ('K') | « ash/DEPS ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698