| Index: ash/system/chromeos/network/tray_network_state_observer.h
|
| diff --git a/ash/system/chromeos/network/tray_network_state_observer.h b/ash/system/chromeos/network/tray_network_state_observer.h
|
| index f062a6b0ee36be356de03f26c173423cd2434e4f..ee51e4b779954a113a11a56716407bf1a5ed18a5 100644
|
| --- a/ash/system/chromeos/network/tray_network_state_observer.h
|
| +++ b/ash/system/chromeos/network/tray_network_state_observer.h
|
| @@ -8,6 +8,7 @@
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/timer/timer.h"
|
| #include "chromeos/network/network_state_handler_observer.h"
|
|
|
| namespace ash {
|
| @@ -16,13 +17,9 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver {
|
| public:
|
| class Delegate {
|
| public:
|
| - // Called when the network state may have changed. If |list_changed| is
|
| - // true then the list of networks may have changed.
|
| - virtual void NetworkStateChanged(bool list_changed) = 0;
|
| -
|
| - // Called when the properties for |network| may have been updated.
|
| - virtual void NetworkServiceChanged(
|
| - const chromeos::NetworkState* network) = 0;
|
| + // Called when any interesting network changes occur. The frequency of this
|
| + // event is limited to kUpdateFrequencyMs.
|
| + virtual void NetworkStateChanged() = 0;
|
|
|
| protected:
|
| virtual ~Delegate() {}
|
| @@ -30,20 +27,23 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver {
|
|
|
| explicit TrayNetworkStateObserver(Delegate* delegate);
|
|
|
| - virtual ~TrayNetworkStateObserver();
|
| + ~TrayNetworkStateObserver() override;
|
|
|
| // NetworkStateHandlerObserver overrides.
|
| - virtual void NetworkListChanged() override;
|
| - virtual void DeviceListChanged() override;
|
| - virtual void DefaultNetworkChanged(
|
| - const chromeos::NetworkState* network) override;
|
| - virtual void NetworkConnectionStateChanged(
|
| - const chromeos::NetworkState* network) override;
|
| - virtual void NetworkPropertiesUpdated(
|
| + void NetworkListChanged() override;
|
| + void DeviceListChanged() override;
|
| + void DefaultNetworkChanged(const chromeos::NetworkState* network) override;
|
| + void NetworkConnectionStateChanged(
|
| const chromeos::NetworkState* network) override;
|
| + void NetworkPropertiesUpdated(const chromeos::NetworkState* network) override;
|
|
|
| private:
|
| Delegate* delegate_;
|
| + bool purge_icons_;
|
| + base::OneShotTimer<TrayNetworkStateObserver> timer_;
|
| +
|
| + void SignalUpdate();
|
| + void SendNetworkStateChanged();
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayNetworkStateObserver);
|
| };
|
|
|