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

Unified Diff: ash/system/chromeos/network/tray_network.h

Issue 11361274: Add NetworkStateListDetailedView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month 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/chromeos/network/tray_network.h
diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h
index a90a16f516149481c48e2e87614ae88ec8937911..45297a28b335ab90d750761549cdd9f55944ed1c 100644
--- a/ash/system/chromeos/network/tray_network.h
+++ b/ash/system/chromeos/network/tray_network.h
@@ -12,6 +12,8 @@
namespace ash {
namespace internal {
+class TrayNetworkStateObserver;
+
namespace tray {
class NetworkDefaultView;
class NetworkDetailedView;
@@ -24,14 +26,12 @@ class NetworkTrayView;
class TrayNetwork : public SystemTrayItem,
public NetworkObserver {
public:
- enum DetailedViewType {
- LIST_VIEW,
- WIFI_VIEW,
- };
-
explicit TrayNetwork(SystemTray* system_tray);
virtual ~TrayNetwork();
+ tray::NetworkDetailedView* detailed() { return detailed_; }
+ void set_request_wifi_view(bool b) { request_wifi_view_ = b; }
+
// Overridden from SystemTrayItem.
virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
@@ -71,6 +71,7 @@ class TrayNetwork : public SystemTrayItem,
tray::NetworkNotificationView* notification_;
scoped_ptr<tray::NetworkMessages> messages_;
bool request_wifi_view_;
+ scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
};
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698