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

ash/system/status_area_widget.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/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #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"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
@@ skipping 30 matching lines @@
   virtual void SetVolumeLevel(float level) OVERRIDE {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DummyVolumeControlDelegate);
 };
 
 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)) {
   }
 
   virtual ~DummySystemTrayDelegate() {}
 
  private:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; }
 
   // Overridden from SystemTrayDelegate:
@@ skipping 115 matching lines @@
   virtual void RequestNetworkScan() OVERRIDE {
   }
 
   virtual void AddBluetoothDevice() OVERRIDE {
   }
 
   virtual void ToggleAirplaneMode() OVERRIDE {
   }
 
   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 {
   }
 
   virtual void ShowOtherCellular() OVERRIDE {
   }
 
   virtual bool IsNetworkConnected() OVERRIDE {
     return true;
   }
 
   virtual bool GetWifiAvailable() OVERRIDE {
     return true;
   }
 
   virtual bool GetMobileAvailable() OVERRIDE {
     return true;
   }
 
   virtual bool GetBluetoothAvailable() OVERRIDE {
     return true;
   }
 
   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 {
     return true;
   }
 
   virtual bool GetCellularCarrierInfo(std::string* carrier_id,
                                       std::string* topup_url,
                                       std::string* setup_url) OVERRIDE {
     return false;
   }
 
   virtual void ShowCellularURL(const std::string& url) OVERRIDE {
   }
 
   virtual void ChangeProxySettings() OVERRIDE {
   }
 
   virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE {
     return volume_control_delegate_.get();
   }
 
   virtual void SetVolumeControlDelegate(
       scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE {
     volume_control_delegate_.swap(delegate);
   }
 
 
-  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_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
 }  // namespace
 
 namespace internal {
@@ skipping 119 matching lines @@
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash