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

Unified Diff: ash/system/tray/system_tray.h

Issue 496563002: Multiprofile security: Show a warning messagebox when desktop casting/sharing is turned on upon user (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed release unit test failure on server Created 6 years, 4 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/chromeos/multi_user/user_switch_util_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 2df725daac7d7a614633c59cb7d3afc805a0c9e8..301ef130d95be17130a2372d5fba68a82e1213c9 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -20,6 +20,7 @@
#include <vector>
namespace ash {
+class ScreenTrayItem;
class SystemBubbleWrapper;
class SystemTrayDelegate;
class SystemTrayItem;
@@ -141,6 +142,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
AnchorAlignment anchor_alignment) const OVERRIDE;
virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
+ ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
+ ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
+
TrayAccessibility* GetTrayAccessibilityForTest() {
return tray_accessibility_;
}
@@ -232,6 +236,10 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
TrayAccessibility* tray_accessibility_; // not owned
TrayDate* tray_date_;
+ // A reference to the Screen share and capture item.
+ ScreenTrayItem* screen_capture_tray_item_; // not owned
+ ScreenTrayItem* screen_share_tray_item_; // not owned
+
DISALLOW_COPY_AND_ASSIGN(SystemTray);
};
« no previous file with comments | « ash/system/chromeos/multi_user/user_switch_util_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698