diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:31:40 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:31:40 +0000 |
| commit | 9abeee5f9efffd8d76762858d2c662f99c9d63f1 (patch) | |
| tree | cad165332d26635b717a2817e5292312a56b92f6 /ash/system/status_area_widget.cc | |
| parent | 979f7a8ef2b439c4e032ae6d777178f847d63e75 (diff) | |
| download | chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.zip chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.tar.gz chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.tar.bz2 | |
Revert 162377 - Move Ash system network trays to ash/system/chromeos
###
Reason:
52>system\chromeos\tray_display.cc(56): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52> ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(56): error C2227: left of '->output_state' must point to class/struct/union/generic type
52>system\chromeos\tray_display.cc(122): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52> ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(122): error C2227: left of '->AddObserver' must point to class/struct/union/generic type
52>system\chromeos\tray_display.cc(127): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52> ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(127): error C2227: left of '->RemoveObserver' must point to class/struct/union/generic type
###
Also adds DEPS to keep chromeos dependencies out of ash/system
This is part of an effort to move chromeos network management code from src/chrome/ to src/chromeos.
BUG=154856
Review URL: https://chromiumcodereview.appspot.com/11039034
TBR=stevenjb@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/status_area_widget.cc')
| -rw-r--r-- | ash/system/status_area_widget.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 769ec6c..59f91a7 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -9,6 +9,7 @@ #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" @@ -200,14 +201,30 @@ 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 { |