Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
index f28867baa85986654352e70b9f980a4e236de086..9c7556a58a654865bd8244161f8b2aa8036cc8fb 100644 |
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
@@ -689,7 +689,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
} |
virtual void ToggleWifi() OVERRIDE { |
+ bool old_wifi_enabled = GetWifiEnabled(); |
network_menu_->ToggleWifi(); |
+ // Use the old state to get the new state because Wi-Fi state is toggled |
+ // asynchronously. |
+ tray_->network_observer()->OnWifiToggled(!old_wifi_enabled); |
Daniel Erat
2012/08/02 14:26:45
Is there any danger of this getting out of sync?
mazda
2012/08/02 17:14:30
TrayNetwork calls GetWifiEnabled, but it's called
Daniel Erat
2012/08/02 17:15:40
Sure, that sounds great to me. Thanks!
mazda
2012/08/02 19:49:16
Renamed OnWifiToggled to OnWillToggleWifi.
|
} |
virtual void ToggleMobile() OVERRIDE { |