| Index: ash/system/chromeos/network/tray_vpn.h
|
| diff --git a/ash/system/chromeos/network/tray_vpn.h b/ash/system/chromeos/network/tray_vpn.h
|
| index 052c52ed90291c870340cdea8d50c5b0503c3804..ece975bf3883e08539e6bcac1e339e5a16a85611 100644
|
| --- a/ash/system/chromeos/network/tray_vpn.h
|
| +++ b/ash/system/chromeos/network/tray_vpn.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
|
| #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
|
|
|
| -#include "ash/system/chromeos/network/network_observer.h"
|
| #include "ash/system/chromeos/network/tray_network_state_observer.h"
|
| #include "ash/system/tray/system_tray_item.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -22,7 +21,6 @@ class VpnDetailedView;
|
| }
|
|
|
| class TrayVPN : public SystemTrayItem,
|
| - public NetworkObserver,
|
| public TrayNetworkStateObserver::Delegate {
|
| public:
|
| explicit TrayVPN(SystemTray* system_tray);
|
| @@ -42,18 +40,6 @@ class TrayVPN : public SystemTrayItem,
|
| virtual void UpdateAfterShelfAlignmentChange(
|
| ShelfAlignment alignment) OVERRIDE;
|
|
|
| - // NetworkObserver
|
| - virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE;
|
| - virtual void SetNetworkMessage(
|
| - NetworkTrayDelegate* delegate,
|
| - MessageType message_type,
|
| - NetworkType network_type,
|
| - const base::string16& title,
|
| - const base::string16& message,
|
| - const std::vector<base::string16>& links) OVERRIDE;
|
| - virtual void ClearNetworkMessage(MessageType message_type) OVERRIDE;
|
| - virtual void OnWillToggleWifi() OVERRIDE;
|
| -
|
| // TrayNetworkStateObserver::Delegate
|
| virtual void NetworkStateChanged(bool list_changed) OVERRIDE;
|
| virtual void NetworkServiceChanged(
|
|
|