| Index: ash/system/tray/system_tray_notifier.h
|
| diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
|
| index fbd9874643e3f4038f38cd0050f69af65e13ca12..66885b9afdfd31d85a36941e3dd278519d9568d1 100644
|
| --- a/ash/system/tray/system_tray_notifier.h
|
| +++ b/ash/system/tray/system_tray_notifier.h
|
| @@ -83,9 +83,6 @@ public:
|
| void AddNetworkObserver(NetworkObserver* observer);
|
| void RemoveNetworkObserver(NetworkObserver* observer);
|
|
|
| - void AddVpnObserver(NetworkObserver* observer);
|
| - void RemoveVpnObserver(NetworkObserver* observer);
|
| -
|
| void AddSmsObserver(SmsObserver* observer);
|
| void RemoveSmsObserver(SmsObserver* observer);
|
|
|
| @@ -119,7 +116,6 @@ public:
|
| #if defined(OS_CHROMEOS)
|
| void NotifyVolumeChanged(float level);
|
| void NotifyMuteToggled();
|
| - void NotifyRefreshNetwork(const NetworkIconInfo &info);
|
| void NotifySetNetworkMessage(NetworkTrayDelegate* delegate,
|
| NetworkObserver::MessageType message_type,
|
| NetworkObserver::NetworkType network_type,
|
| @@ -127,8 +123,7 @@ public:
|
| const base::string16& message,
|
| const std::vector<base::string16>& links);
|
| void NotifyClearNetworkMessage(NetworkObserver::MessageType message_type);
|
| - void NotifyVpnRefreshNetwork(const NetworkIconInfo &info);
|
| - void NotifyWillToggleWifi();
|
| + void NotifyRequestToggleWifi();
|
| void NotifyAddSmsMessage(const base::DictionaryValue& message);
|
| void NotifyEnterpriseDomainChanged();
|
| void NotifyScreenCaptureStart(const base::Closure& stop_callback,
|
| @@ -152,7 +147,6 @@ public:
|
| #if defined(OS_CHROMEOS)
|
| ObserverList<AudioObserver> audio_observers_;
|
| ObserverList<NetworkObserver> network_observers_;
|
| - ObserverList<NetworkObserver> vpn_observers_;
|
| ObserverList<SmsObserver> sms_observers_;
|
| ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
|
| ObserverList<ScreenCaptureObserver> screen_capture_observers_;
|
|
|