Move ash/system/network to ash/system/chromeos

ash/system/status_area_widget.cc

Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 937062566a31c9ae93adec41668f3018f5d8354f..894cc719cb942724eb4cfe7488602cb9dd825d33 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -9,7 +9,6 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
-#include "ash/system/network/network_observer.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -60,10 +59,7 @@ class DummyVolumeControlDelegate : public VolumeControlDelegate {
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
   DummySystemTrayDelegate()
-      : wifi_enabled_(true),
-        cellular_enabled_(true),
-        bluetooth_enabled_(true),
-        caps_lock_enabled_(false),
+      : caps_lock_enabled_(false),
         volume_control_delegate_(
             ALLOW_THIS_IN_INITIALIZER_LIST(new DummyVolumeControlDelegate)) {
   }
@@ -199,31 +195,12 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
   }
 
   virtual void ToggleWifi() OVERRIDE {
-    wifi_enabled_ = !wifi_enabled_;
-    ash::NetworkObserver* observer =
-        ash::Shell::GetInstance()->system_tray()->network_observer();
-    if (observer) {
-      ash::NetworkIconInfo info;
-      observer->OnNetworkRefresh(info);
-    }
   }
 
   virtual void ToggleMobile() OVERRIDE {
-    cellular_enabled_ = !cellular_enabled_;
-    ash::NetworkObserver* observer =
-        ash::Shell::GetInstance()->system_tray()->network_observer();
-    if (observer) {
-      ash::NetworkIconInfo info;
-      observer->OnNetworkRefresh(info);
-    }
   }
 
   virtual void ToggleBluetooth() OVERRIDE {
-    bluetooth_enabled_ = !bluetooth_enabled_;
-    ash::BluetoothObserver* observer =
-        ash::Shell::GetInstance()->system_tray()->bluetooth_observer();
-    if (observer)
-      observer->OnBluetoothRefresh();
   }
 
   virtual void ShowOtherWifi() OVERRIDE {
@@ -249,15 +226,15 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
   }
 
   virtual bool GetWifiEnabled() OVERRIDE {
-    return wifi_enabled_;
+    return false;
   }
 
   virtual bool GetMobileEnabled() OVERRIDE {
-    return cellular_enabled_;
+    return false;
   }
 
   virtual bool GetBluetoothEnabled() OVERRIDE {
-    return bluetooth_enabled_;
+    return false;
   }
 
   virtual bool GetMobileScanSupported() OVERRIDE {
@@ -286,9 +263,6 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
   }
 
 
-  bool wifi_enabled_;
-  bool cellular_enabled_;
-  bool bluetooth_enabled_;

[sadrul, 2012/10/09 14:40:58]

Why are these removed?

[stevenjb, 2012/10/09 19:04:14]

Restored.

   bool caps_lock_enabled_;
   gfx::ImageSkia null_image_;
   scoped_ptr<VolumeControlDelegate> volume_control_delegate_;