diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:54:50 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:54:50 +0000 |
| commit | a28d3c7da15c91a645b5d8697dac603081dc0d10 (patch) | |
| tree | 1b0c13af95d8b033cb6ca402b3979d2fae5d84da | |
| parent | d4c0ca6fff00aed010e339b612358fdd0b66dc69 (diff) | |
| download | chromium_src-a28d3c7da15c91a645b5d8697dac603081dc0d10.zip chromium_src-a28d3c7da15c91a645b5d8697dac603081dc0d10.tar.gz chromium_src-a28d3c7da15c91a645b5d8697dac603081dc0d10.tar.bz2 | |
Suppress non-error network error notifications
BUG=333955
R=armansito@chromium.org
Review URL: https://codereview.chromium.org/134733014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257219 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/chromeos/network/network_state_notifier.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc index fb90fca..223c663 100644 --- a/ash/system/chromeos/network/network_state_notifier.cc +++ b/ash/system/chromeos/network/network_state_notifier.cc @@ -214,6 +214,14 @@ void NetworkStateNotifier::ConnectErrorPropertiesSucceeded( const std::string& shill_error, const std::string& service_path, const base::DictionaryValue& shill_properties) { + std::string state; + shill_properties.GetStringWithoutPathExpansion(shill::kStateProperty, &state); + if (chromeos::NetworkState::StateIsConnected(state) || + chromeos::NetworkState::StateIsConnecting(state)) { + // Network is no longer in an error state. This can happen if an unexpected + // Idle state transition occurs, see crbug.com/333955. + return; + } ShowConnectErrorNotification(error_name, shill_error, service_path, shill_properties); } |