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

Unified Diff: ash/system/chromeos/screen_security/screen_capture_tray_item.h

Issue 1118613003: Add UI for cast system tray integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken unit tests Created 5 years, 7 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
« no previous file with comments | « ash/system/cast/tray_cast.cc ('k') | ash/system/chromeos/screen_security/screen_capture_tray_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/screen_security/screen_capture_tray_item.h
diff --git a/ash/system/chromeos/screen_security/screen_capture_tray_item.h b/ash/system/chromeos/screen_security/screen_capture_tray_item.h
index 5c6ed8aeac9141b1e992bb9e4064453d7b1374f4..bf408f6e40230386d2d6e0c9ffb767c9e8dc0c5d 100644
--- a/ash/system/chromeos/screen_security/screen_capture_tray_item.h
+++ b/ash/system/chromeos/screen_security/screen_capture_tray_item.h
@@ -5,6 +5,7 @@
#ifndef ASH_SYSTEM_CHROMEOS_SCREEN_CAPTURE_SCREEN_CAPTURE_TRAY_ITEM_H_
#define ASH_SYSTEM_CHROMEOS_SCREEN_CAPTURE_SCREEN_CAPTURE_TRAY_ITEM_H_
+#include "ash/shell_observer.h"
#include "ash/system/chromeos/screen_security/screen_capture_observer.h"
#include "ash/system/chromeos/screen_security/screen_tray_item.h"
@@ -15,7 +16,8 @@ class View;
namespace ash {
class ASH_EXPORT ScreenCaptureTrayItem : public ScreenTrayItem,
- public ScreenCaptureObserver {
+ public ScreenCaptureObserver,
+ public ShellObserver {
public:
explicit ScreenCaptureTrayItem(SystemTray* system_tray);
~ScreenCaptureTrayItem() override;
@@ -35,7 +37,11 @@ class ASH_EXPORT ScreenCaptureTrayItem : public ScreenTrayItem,
const base::string16& screen_capture_status) override;
void OnScreenCaptureStop() override;
+ // Overridden from ShellObserver.
+ void OnCastingSessionStartedOrStopped(bool started) override;
+
base::string16 screen_capture_status_;
+ bool is_casting_ = false;
DISALLOW_COPY_AND_ASSIGN(ScreenCaptureTrayItem);
};
« no previous file with comments | « ash/system/cast/tray_cast.cc ('k') | ash/system/chromeos/screen_security/screen_capture_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698