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

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

Issue 10907224: Data promo notification should follow the normal ash notifications theme. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 3 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 eaed13066ffff18d7f5ccc4488936158ea8e88ad..b4d7e08b357364a3c404e7d270a15ed900ade021 100644
--- a/ash/system/network/tray_network.h
+++ b/ash/system/network/tray_network.h
@@ -15,8 +15,8 @@ namespace internal {
namespace tray {
class NetworkDefaultView;
class NetworkDetailedView;
-class NetworkErrors;
-class NetworkErrorView;
+class NetworkMessages;
+class NetworkMessageView;
class NetworkNotificationView;
class NetworkTrayView;
}
@@ -48,27 +48,27 @@ class TrayNetwork : public SystemTrayItem,
// 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;
+ virtual void SetNetworkMessage(NetworkTrayDelegate* delegate,
+ MessageType message_type,
+ const string16& title,
+ const string16& message,
+ const std::vector<string16>& links) OVERRIDE;
+ virtual void ClearNetworkMessage(MessageType message_type) OVERRIDE;
virtual void OnWillToggleWifi() OVERRIDE;
private:
- friend class tray::NetworkErrorView;
+ friend class tray::NetworkMessageView;
friend class tray::NetworkNotificationView;
- void LinkClicked(ErrorType error_type);
+ void LinkClicked(MessageType message_type, int link_id);
- const tray::NetworkErrors* errors() const { return errors_.get(); }
+ const tray::NetworkMessages* messages() const { return messages_.get(); }
tray::NetworkTrayView* tray_;
tray::NetworkDefaultView* default_;
tray::NetworkDetailedView* detailed_;
tray::NetworkNotificationView* notification_;
- scoped_ptr<tray::NetworkErrors> errors_;
+ scoped_ptr<tray::NetworkMessages> messages_;
bool request_wifi_view_;
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