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

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

Issue 1218653006: Add support code to test the cast system tray item. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 5 years, 5 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
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index b21ba11f869469bb1f3280a84a23c309bef955b3..140921657cd32736b07e910c77fd992861ab1374 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -6,6 +6,7 @@
#define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
#include "ash/ash_export.h"
+#include "ash/system/cast/tray_cast.h"
#include "ash/system/tray/system_tray_bubble.h"
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/user/login_status.h"
@@ -150,6 +151,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
// Get the tray item view (or NULL) for a given |tray_item| in a unit test.
views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item);
+ // Gets tray_cast_ for browser tests.
+ TrayCast* GetTrayCastForTesting() const;
+
// Gets tray_date_ for browser tests.
TrayDate* GetTrayDateForTesting() const;
@@ -232,6 +236,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
bool full_system_tray_menu_;
TrayAccessibility* tray_accessibility_; // not owned
+ TrayCast* tray_cast_;
TrayDate* tray_date_;
// A reference to the Screen share and capture item.

Powered by Google App Engine
This is Rietveld 408576698