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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
643 } | 643 } |
644 | 644 |
645 virtual void ShowOtherWifi() OVERRIDE { | 645 virtual void ShowOtherWifi() OVERRIDE { |
646 network_menu_->ShowOtherWifi(); | 646 network_menu_->ShowOtherWifi(); |
647 } | 647 } |
648 | 648 |
649 virtual void ShowOtherCellular() OVERRIDE { | 649 virtual void ShowOtherCellular() OVERRIDE { |
650 network_menu_->ShowOtherCellular(); | 650 network_menu_->ShowOtherCellular(); |
651 } | 651 } |
652 | 652 |
| 653 virtual bool Connected() OVERRIDE { |
| 654 return CrosLibrary::Get()->GetNetworkLibrary()->Connected(); |
| 655 } |
| 656 |
653 virtual bool GetWifiAvailable() OVERRIDE { | 657 virtual bool GetWifiAvailable() OVERRIDE { |
654 return CrosLibrary::Get()->GetNetworkLibrary()->wifi_available(); | 658 return CrosLibrary::Get()->GetNetworkLibrary()->wifi_available(); |
655 } | 659 } |
656 | 660 |
657 virtual bool GetCellularAvailable() OVERRIDE { | 661 virtual bool GetCellularAvailable() OVERRIDE { |
658 return CrosLibrary::Get()->GetNetworkLibrary()->cellular_available(); | 662 return CrosLibrary::Get()->GetNetworkLibrary()->cellular_available(); |
659 } | 663 } |
660 | 664 |
661 virtual bool GetBluetoothAvailable() OVERRIDE { | 665 virtual bool GetBluetoothAvailable() OVERRIDE { |
662 return bluetooth_adapter_->IsPresent(); | 666 return bluetooth_adapter_->IsPresent(); |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1193 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1197 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1194 }; | 1198 }; |
1195 | 1199 |
1196 } // namespace | 1200 } // namespace |
1197 | 1201 |
1198 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { | 1202 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { |
1199 return new chromeos::SystemTrayDelegate(tray); | 1203 return new chromeos::SystemTrayDelegate(tray); |
1200 } | 1204 } |
1201 | 1205 |
1202 } // namespace chromeos | 1206 } // namespace chromeos |
OLD | NEW |