Deprecate kAshDisableNewNetworkStatusArea

ash/system/tray/system_tray_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/system_tray_notifier.h"
 
 namespace ash {
 
 SystemTrayNotifier::SystemTrayNotifier() {
 }
@@ skipping 115 matching lines @@
 }
 
 void SystemTrayNotifier::AddNetworkObserver(NetworkObserver* observer) {
   network_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveNetworkObserver(NetworkObserver* observer) {
   network_observers_.RemoveObserver(observer);
 }
 
-void SystemTrayNotifier::AddVpnObserver(NetworkObserver* observer) {
-  vpn_observers_.AddObserver(observer);
-}
-
-void SystemTrayNotifier::RemoveVpnObserver(NetworkObserver* observer) {
-  vpn_observers_.RemoveObserver(observer);
-}
-
 void SystemTrayNotifier::AddSmsObserver(SmsObserver* observer) {
   sms_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveSmsObserver(SmsObserver* observer) {
   sms_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::AddEnterpriseDomainObserver(
     EnterpriseDomainObserver* observer) {
@@ skipping 131 matching lines @@
                     audio_observers_,
                     OnVolumeChanged(level));
 }
 
 void SystemTrayNotifier::NotifyMuteToggled() {
   FOR_EACH_OBSERVER(AudioObserver,
                     audio_observers_,
                     OnMuteToggled());
 }
 
-void SystemTrayNotifier::NotifyRefreshNetwork(const NetworkIconInfo &info) {
-  FOR_EACH_OBSERVER(NetworkObserver,
-                    network_observers_,
-                    OnNetworkRefresh(info));
-}
-
 void SystemTrayNotifier::NotifySetNetworkMessage(
     NetworkTrayDelegate* delegate,
     NetworkObserver::MessageType message_type,
     NetworkObserver::NetworkType network_type,
     const base::string16& title,
     const base::string16& message,
     const std::vector<base::string16>& links) {
   FOR_EACH_OBSERVER(NetworkObserver,
                     network_observers_,
                     SetNetworkMessage(
                         delegate,
                         message_type,
                         network_type,
                         title,
                         message,
                         links));
 }
 
 void SystemTrayNotifier::NotifyClearNetworkMessage(
     NetworkObserver::MessageType message_type) {
   FOR_EACH_OBSERVER(NetworkObserver,
                     network_observers_,
                     ClearNetworkMessage(message_type));
 }
 
-void SystemTrayNotifier::NotifyVpnRefreshNetwork(const NetworkIconInfo &info) {
-  FOR_EACH_OBSERVER(NetworkObserver,
-                    vpn_observers_,
-                    OnNetworkRefresh(info));
-}
-
-void SystemTrayNotifier::NotifyWillToggleWifi() {
+void SystemTrayNotifier::NotifyRequestToggleWifi() {
   FOR_EACH_OBSERVER(NetworkObserver,
                     network_observers_,
-                    OnWillToggleWifi());
+                    RequestToggleWifi());
 }
 
 void SystemTrayNotifier::NotifyAddSmsMessage(
     const base::DictionaryValue& message) {
   FOR_EACH_OBSERVER(SmsObserver, sms_observers_, AddMessage(message));
 }
 
 void SystemTrayNotifier::NotifyEnterpriseDomainChanged() {
   FOR_EACH_OBSERVER(EnterpriseDomainObserver, enterprise_domain_observers_,
       OnEnterpriseDomainChanged());
 }
 
 void SystemTrayNotifier::NotifyScreenCaptureStart(
     const base::Closure& stop_callback,
     const base::string16& sharing_app_name) {
   FOR_EACH_OBSERVER(ScreenCaptureObserver, screen_capture_observers_,
                     OnScreenCaptureStart(stop_callback, sharing_app_name));
 }
 
 void SystemTrayNotifier::NotifyScreenCaptureStop() {
   FOR_EACH_OBSERVER(ScreenCaptureObserver, screen_capture_observers_,
                     OnScreenCaptureStop());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash