Chromium Code Reviews| Index: ash/system/network/network_observer.h |
| diff --git a/ash/system/network/network_observer.h b/ash/system/network/network_observer.h |
| index 9711332e3a533946076866f82c39a3d4a3257e53..71b6595b4a098856585eec8182e4b3f1a8a656da 100644 |
| --- a/ash/system/network/network_observer.h |
| +++ b/ash/system/network/network_observer.h |
| @@ -5,43 +5,47 @@ |
| #ifndef ASH_SYSTEM_NETWORK_NETWORK_OBSERVER_H |
| #define ASH_SYSTEM_NETWORK_NETWORK_OBSERVER_H |
| +#include <vector> |
| + |
| #include "base/string16.h" |
| namespace ash { |
| struct NetworkIconInfo; |
| -class NetworkTrayDelegate; |
| class NetworkTrayDelegate { |
| public: |
| virtual ~NetworkTrayDelegate() {} |
| - virtual void NotificationLinkClicked() = 0; |
| + // Notifies that the |index|-th link on the notification is clicked. |
| + virtual void NotificationLinkClicked(size_t index) = 0; |
| }; |
| class NetworkObserver { |
| public: |
| - enum ErrorType { |
| + enum MessageType { |
| // Priority order, highest to lowest. |
| ERROR_CONNECT_FAILED, |
| ERROR_DATA_NONE, |
| - ERROR_DATA_LOW |
| + ERROR_DATA_LOW, |
|
sadrul
2012/09/13 22:47:39
Change ERROR_s to MESSAGE_s
varunjain
2012/09/13 22:54:24
Done.
|
| + |
| + MESSAGE_DATA_PROMO, |
| }; |
| virtual ~NetworkObserver() {} |
| virtual void OnNetworkRefresh(const NetworkIconInfo& info) = 0; |
| - // Sets a network error notification. |error_type| identifies the type of |
| - // error. |delegate|->NotificationLinkClicked() will be called if |link_text| |
| - // is clicked (if supplied, |link_text| may be empty). |
| - virtual void SetNetworkError(NetworkTrayDelegate* delegate, |
| - ErrorType error_type, |
| - const string16& title, |
| - const string16& message, |
| - const string16& link_text) = 0; |
| - // Clears the error notification for |error_type|. |
| - virtual void ClearNetworkError(ErrorType error_type) = 0; |
| + // Sets a network message notification. |message_type| identifies the type of |
| + // message. |delegate|->NotificationLinkClicked() will be called if any of the |
| + // |links| are clicked (if supplied, |links| may be empty). |
| + virtual void SetNetworkMessage(NetworkTrayDelegate* delegate, |
| + MessageType message_type, |
| + const string16& title, |
| + const string16& message, |
| + const std::vector<string16>& links) = 0; |
| + // Clears the message notification for |message_type|. |
| + virtual void ClearNetworkMessage(MessageType message_type) = 0; |
| // Called when the user attempted to toggle Wi-Fi enable/disable. |
| // NOTE: Toggling is asynchronous and subsequent calls to query the current |