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

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

Issue 2565823002: Reland: Add test for system tray network menu icon for extension-controlled networks (Closed)
Patch Set: fix use-after-free Created 4 years 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/common/system/networking_config_delegate.h ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.h
diff --git a/ash/common/system/tray/system_tray.h b/ash/common/system/tray/system_tray.h
index 0e5ed5b1f915c6f6c2b950c36536d7f91a8192a5..1df9954a666fa10a5a85e57550766d53d10f958c 100644
--- a/ash/common/system/tray/system_tray.h
+++ b/ash/common/system/tray/system_tray.h
@@ -29,6 +29,7 @@ class TrayAccessibility;
class TrayAudio;
class TrayCast;
class TrayDate;
+class TrayNetwork;
class TraySystemInfo;
class TrayTiles;
class TrayUpdate;
@@ -164,6 +165,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
TrayCast* GetTrayCastForTesting() const;
TrayDate* GetTrayDateForTesting() const;
+ TrayNetwork* GetTrayNetworkForTesting() const;
TraySystemInfo* GetTraySystemInfoForTesting() const;
TrayTiles* GetTrayTilesForTesting() const;
TrayUpdate* GetTrayUpdateForTesting() const;
@@ -267,6 +269,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
TrayAudio* tray_audio_; // May be null.
TrayCast* tray_cast_;
TrayDate* tray_date_; // null for material design.
+ TrayNetwork* tray_network_;
TrayTiles* tray_tiles_; // only used in material design.
TraySystemInfo* tray_system_info_; // only used in material design.
TrayUpdate* tray_update_;
« no previous file with comments | « ash/common/system/networking_config_delegate.h ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698