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

Unified Diff: chromeos/network/network_state_handler.cc

Issue 14188057: Add some additional network debugging code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 863e20f75ee5109ad4c2d2504341dc4861e31a0a..a0789110b7d477d725a36c6127edd1ccb1a3b988 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -71,6 +71,13 @@ std::string ValueAsString(const base::Value& value) {
return "";
}
+bool ConnectionStateChanged(chromeos::NetworkState* network,
+ const std::string& prev_connection_state) {
+ return (network->connection_state() != prev_connection_state) &&
+ (network->connection_state() != flimflam::kStateIdle ||
+ !prev_connection_state.empty());
+}
+
} // namespace
namespace chromeos {
@@ -408,7 +415,7 @@ void NetworkStateHandler::UpdateManagedStateProperties(
NetworkState* network = managed->AsNetworkState();
DCHECK(network);
// Signal connection state changed after all properties have been updated.
- if (network->connection_state() != prev_connection_state)
+ if (ConnectionStateChanged(network, prev_connection_state))
OnNetworkConnectionStateChanged(network);
NetworkPropertiesUpdated(network);
}
@@ -431,7 +438,7 @@ void NetworkStateHandler::UpdateNetworkServiceProperty(
detail += " = " + vstr;
network_event_log::AddEntry(kLogModule, "NetworkPropertyUpdated", detail);
- if (network->connection_state() != prev_connection_state) {
+ if (ConnectionStateChanged(network, prev_connection_state)) {
OnNetworkConnectionStateChanged(network);
} else if (network->path() == default_network_path_ &&
key != flimflam::kSignalStrengthProperty) {
« ash/system/chromeos/network/tray_network.cc ('K') | « ash/system/chromeos/network/tray_network.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698