| Index: ash/system/tray/system_tray_notifier.h
|
| diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
|
| index 29cd9d2bb3fb66225b2ad168e527eae2e3f71fa1..6e6b03fc97d7b4dbf7e13e9234c6b26b1f3656f9 100644
|
| --- a/ash/system/tray/system_tray_notifier.h
|
| +++ b/ash/system/tray/system_tray_notifier.h
|
| @@ -30,6 +30,7 @@
|
| #include "ash/system/chromeos/session/last_window_closed_observer.h"
|
| #include "ash/system/chromeos/session/logout_button_observer.h"
|
| #include "ash/system/chromeos/session/session_length_limit_observer.h"
|
| +#include "ash/system/tray/media_security/media_capture_observer.h"
|
| #include "base/time/time.h"
|
| #endif
|
|
|
| @@ -92,6 +93,9 @@ class ASH_EXPORT SystemTrayNotifier {
|
| void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
|
| void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
|
|
|
| + void AddMediaCaptureObserver(MediaCaptureObserver* observer);
|
| + void RemoveMediaCaptureObserver(MediaCaptureObserver* observer);
|
| +
|
| void AddScreenCaptureObserver(ScreenCaptureObserver* observer);
|
| void RemoveScreenCaptureObserver(ScreenCaptureObserver* observer);
|
|
|
| @@ -133,6 +137,7 @@ class ASH_EXPORT SystemTrayNotifier {
|
| void NotifyRequestToggleWifi();
|
| void NotifyOnCaptivePortalDetected(const std::string& service_path);
|
| void NotifyEnterpriseDomainChanged();
|
| + void NotifyMediaCaptureChanged();
|
| void NotifyScreenCaptureStart(const base::Closure& stop_callback,
|
| const base::string16& sharing_app_name);
|
| void NotifyScreenCaptureStop();
|
| @@ -164,6 +169,7 @@ class ASH_EXPORT SystemTrayNotifier {
|
| ObserverList<NetworkPortalDetectorObserver>
|
| network_portal_detector_observers_;
|
| ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
|
| + ObserverList<MediaCaptureObserver> media_capture_observers_;
|
| ObserverList<ScreenCaptureObserver> screen_capture_observers_;
|
| ObserverList<ScreenShareObserver> screen_share_observers_;
|
| ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
|
|
|