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

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

Issue 22340006: Show notifications for Network Config errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + move comment Created 7 years, 4 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/chromeos/network/network_icon.cc ('k') | ash/system/chromeos/network/network_state_notifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/network_state_notifier.h
diff --git a/ash/system/chromeos/network/network_state_notifier.h b/ash/system/chromeos/network/network_state_notifier.h
index cfcc4b788b0d7b5e09df0cb151b9b5de7024276d..30a41b35a60a00ecdbbcb8eb2cfa2e7c25c9ef30 100644
--- a/ash/system/chromeos/network/network_state_notifier.h
+++ b/ash/system/chromeos/network/network_state_notifier.h
@@ -20,12 +20,19 @@ class NetworkState;
namespace ash {
-// This class observes NetworkStateHandler and generates notifications
-// on connection failures. NOTE: The Observer for this class only triggers
-// "Out of credits" notifications, and failures triggered from NetworkLibrary
-// calls (which sets NetworkStateHandler::connecting_network()).
-// Failures from NetworkStateListDetailedView::ConnectToNetwork are now
-// handled by the ConnectToNetwork callbacks.
+// This class has two purposes:
+// 1. ShowNetworkConnectError() gets called after any user initiated connect
+// failure. This will handle displaying an error notification.
+// NOTE: Because Shill sets the Error property of a Service *after*
+// the Connect call fails, this class will delay the notification if
+// necessary until the Error property is set so that the correct
+// message can be displayed.
+// TODO(stevenjb): convert this class to use the new MessageCenter
+// notification system, generate a notification immediately, and update
+// it when the Error property is set to guarantee that a notification is
+// displayed for every failure.
+// 2. It observes NetworkState changes to generate notifications when a
+// Cellular network is out of credits.
class ASH_EXPORT NetworkStateNotifier :
public chromeos::NetworkStateHandlerObserver,
public NetworkTrayDelegate {
@@ -34,10 +41,9 @@ class ASH_EXPORT NetworkStateNotifier :
virtual ~NetworkStateNotifier();
// NetworkStateHandlerObserver
+ virtual void NetworkListChanged() OVERRIDE;
virtual void DefaultNetworkChanged(
const chromeos::NetworkState* network) OVERRIDE;
- virtual void NetworkConnectionStateChanged(
- const chromeos::NetworkState* network) OVERRIDE;
virtual void NetworkPropertiesUpdated(
const chromeos::NetworkState* network) OVERRIDE;
@@ -53,14 +59,9 @@ class ASH_EXPORT NetworkStateNotifier :
private:
typedef std::map<std::string, std::string> CachedStateMap;
- void ShowConnectError(const std::string& error_name,
- const chromeos::NetworkState* network);
-
- void InitializeNetworks();
-
- CachedStateMap cached_state_;
std::string last_active_network_;
std::string cellular_network_;
+ std::string connect_failed_network_;
bool cellular_out_of_credits_;
base::Time out_of_credits_notify_time_;
« no previous file with comments | « ash/system/chromeos/network/network_icon.cc ('k') | ash/system/chromeos/network/network_state_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698