Observe ConnectionState changed events in TrayNetworkStateObserver

BUG=374452
R=benchan@chromium.org, jennyz@chromium.org

Review URL: https://codereview.chromium.org/286923003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271706 0039d316-1c4b-4281-b951-d872f2087c98

ash/system/chromeos/network/tray_network_state_observer.cc

@@ -41,16 +41,32 @@ void TrayNetworkStateObserver::DeviceListChanged() {
   delegate_->NetworkStateChanged(false);
 }
 
+// Any change to the Default (primary connected) network, including Strength
+// changes, should trigger a NetworkStateChanged update.
 void TrayNetworkStateObserver::DefaultNetworkChanged(
     const chromeos::NetworkState* network) {
   delegate_->NetworkStateChanged(true);
 }
 
+// Any change to the Connection State should trigger a NetworkStateChanged
+// update. This is important when both a VPN and a physical network are
+// connected.
+void TrayNetworkStateObserver::NetworkConnectionStateChanged(
+    const chromeos::NetworkState* network) {
+  delegate_->NetworkStateChanged(true);
+}
+
+// This tracks Strength and other property changes for all networks. It will
+// be called in addition to NetworkConnectionStateChanged for connection state
+// changes.
 void TrayNetworkStateObserver::NetworkPropertiesUpdated(
     const chromeos::NetworkState* network) {
   if (network ==
-      NetworkHandler::Get()->network_state_handler()->DefaultNetwork())
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) {
+    // Trigger NetworkStateChanged in case the Strength property of the
+    // Default network changed.
     delegate_->NetworkStateChanged(true);
+  }
   delegate_->NetworkServiceChanged(network);
 }
 

ash/system/chromeos/network/tray_network_state_observer.h

@@ -37,6 +37,8 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver {
   virtual void DeviceListChanged() 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;