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

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

Issue 10407080: Add NetworkNotificationView to tray_network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix NOTREACHED Created 8 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/network/network_observer.h ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/tray_network.h
diff --git a/ash/system/network/tray_network.h b/ash/system/network/tray_network.h
index a16a3d4ef4571e72c869e6cc031b086843b46c63..0d22b329c75cbc15e6fc25154f4321bc92e4cea4 100644
--- a/ash/system/network/tray_network.h
+++ b/ash/system/network/tray_network.h
@@ -8,6 +8,7 @@
#include "ash/system/network/network_observer.h"
#include "ash/system/tray/system_tray_item.h"
+#include "base/memory/scoped_ptr.h"
namespace ash {
namespace internal {
@@ -15,6 +16,9 @@ namespace internal {
namespace tray {
class NetworkDefaultView;
class NetworkDetailedView;
+class NetworkErrors;
+class NetworkErrorView;
+class NetworkNotificationView;
class NetworkTrayView;
}
@@ -24,22 +28,40 @@ class TrayNetwork : public SystemTrayItem,
TrayNetwork();
virtual ~TrayNetwork();
- private:
// Overridden from SystemTrayItem.
virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
+ virtual views::View* CreateNotificationView(
+ user::LoginStatus status) OVERRIDE;
virtual void DestroyTrayView() OVERRIDE;
virtual void DestroyDefaultView() OVERRIDE;
virtual void DestroyDetailedView() OVERRIDE;
+ virtual void DestroyNotificationView() OVERRIDE;
virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
// Overridden from NetworkObserver.
virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE;
+ virtual void SetNetworkError(NetworkTrayDelegate* delegate,
+ ErrorType error_type,
+ const string16& title,
+ const string16& message,
+ const string16& link_text) OVERRIDE;
+ virtual void ClearNetworkError(ErrorType error_type) OVERRIDE;
+
+ private:
+ friend class tray::NetworkErrorView;
+ friend class tray::NetworkNotificationView;
+
+ void LinkClicked(ErrorType error_type);
+
+ const tray::NetworkErrors* errors() const { return errors_.get(); }
tray::NetworkTrayView* tray_;
tray::NetworkDefaultView* default_;
tray::NetworkDetailedView* detailed_;
+ tray::NetworkNotificationView* notification_;
+ scoped_ptr<tray::NetworkErrors> errors_;
DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
};
« no previous file with comments | « ash/system/network/network_observer.h ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698