OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" | 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/system/audio/audio_observer.h" | 9 #include "ash/system/audio/audio_observer.h" |
10 #include "ash/system/bluetooth/bluetooth_observer.h" | 10 #include "ash/system/bluetooth/bluetooth_observer.h" |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 } | 659 } |
660 | 660 |
661 virtual void ShowOtherWifi() OVERRIDE { | 661 virtual void ShowOtherWifi() OVERRIDE { |
662 network_menu_->ShowOtherWifi(); | 662 network_menu_->ShowOtherWifi(); |
663 } | 663 } |
664 | 664 |
665 virtual void ShowOtherCellular() OVERRIDE { | 665 virtual void ShowOtherCellular() OVERRIDE { |
666 network_menu_->ShowOtherCellular(); | 666 network_menu_->ShowOtherCellular(); |
667 } | 667 } |
668 | 668 |
| 669 virtual bool IsNetworkConnected() OVERRIDE { |
| 670 return CrosLibrary::Get()->GetNetworkLibrary()->Connected(); |
| 671 } |
| 672 |
669 virtual bool GetWifiAvailable() OVERRIDE { | 673 virtual bool GetWifiAvailable() OVERRIDE { |
670 return CrosLibrary::Get()->GetNetworkLibrary()->wifi_available(); | 674 return CrosLibrary::Get()->GetNetworkLibrary()->wifi_available(); |
671 } | 675 } |
672 | 676 |
673 virtual bool GetMobileAvailable() OVERRIDE { | 677 virtual bool GetMobileAvailable() OVERRIDE { |
674 return CrosLibrary::Get()->GetNetworkLibrary()->mobile_available(); | 678 return CrosLibrary::Get()->GetNetworkLibrary()->mobile_available(); |
675 } | 679 } |
676 | 680 |
677 virtual bool GetBluetoothAvailable() OVERRIDE { | 681 virtual bool GetBluetoothAvailable() OVERRIDE { |
678 return bluetooth_adapter_->IsPresent(); | 682 return bluetooth_adapter_->IsPresent(); |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1209 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1213 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1210 }; | 1214 }; |
1211 | 1215 |
1212 } // namespace | 1216 } // namespace |
1213 | 1217 |
1214 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { | 1218 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { |
1215 return new chromeos::SystemTrayDelegate(tray); | 1219 return new chromeos::SystemTrayDelegate(tray); |
1216 } | 1220 } |
1217 | 1221 |
1218 } // namespace chromeos | 1222 } // namespace chromeos |
OLD | NEW |