Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Unified Diff: ash/system/tray/test_system_tray_delegate.cc

Issue 15350002: Deprecate kAshDisableNewNetworkStatusArea (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/test_system_tray_delegate.h ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/test_system_tray_delegate.cc
diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc
index a833f18c3c835ea4ee09e3d4621261fd45b29bc1..c2eb2df5edd1e68faedad330d38f6707d1537b32 100644
--- a/ash/system/tray/test_system_tray_delegate.cc
+++ b/ash/system/tray/test_system_tray_delegate.cc
@@ -51,9 +51,7 @@ class TestVolumeControlDelegate : public VolumeControlDelegate {
} // namespace
TestSystemTrayDelegate::TestSystemTrayDelegate()
- : wifi_enabled_(true),
- cellular_enabled_(true),
- bluetooth_enabled_(true),
+ : bluetooth_enabled_(true),
caps_lock_enabled_(false),
volume_control_delegate_(new TestVolumeControlDelegate) {
}
@@ -213,53 +211,15 @@ void TestSystemTrayDelegate::GetDriveOperationStatusList(
ash::DriveOperationStatusList*) {
}
-void TestSystemTrayDelegate::GetMostRelevantNetworkIcon(NetworkIconInfo* info,
- bool large) {
-}
-
-void TestSystemTrayDelegate::GetVirtualNetworkIcon(ash::NetworkIconInfo* info) {
-}
-
-void TestSystemTrayDelegate::GetAvailableNetworks(
- std::vector<NetworkIconInfo>* list) {
-}
-
-void TestSystemTrayDelegate::GetVirtualNetworks(
- std::vector<NetworkIconInfo>* list) {
-}
-
void TestSystemTrayDelegate::ConfigureNetwork(const std::string& network_id) {
}
void TestSystemTrayDelegate::ConnectToNetwork(const std::string& network_id) {
}
-void TestSystemTrayDelegate::GetNetworkAddresses(
- std::string* ip_address,
- std::string* ethernet_mac_address,
- std::string* wifi_mac_address) {
- *ip_address = "127.0.0.1";
- *ethernet_mac_address = "00:11:22:33:44:55";
- *wifi_mac_address = "66:77:88:99:00:11";
-}
-
-void TestSystemTrayDelegate::RequestNetworkScan() {
-}
-
void TestSystemTrayDelegate::AddBluetoothDevice() {
}
-void TestSystemTrayDelegate::ToggleAirplaneMode() {
-}
-
-void TestSystemTrayDelegate::ToggleWifi() {
- wifi_enabled_ = !wifi_enabled_;
-}
-
-void TestSystemTrayDelegate::ToggleMobile() {
- cellular_enabled_ = !cellular_enabled_;
-}
-
void TestSystemTrayDelegate::ToggleBluetooth() {
bluetooth_enabled_ = !bluetooth_enabled_;
}
@@ -280,52 +240,20 @@ void TestSystemTrayDelegate::ShowOtherVPN() {
void TestSystemTrayDelegate::ShowOtherCellular() {
}
-bool TestSystemTrayDelegate::IsNetworkConnected() {
- return true;
-}
-
-bool TestSystemTrayDelegate::GetWifiAvailable() {
- return true;
-}
-
-bool TestSystemTrayDelegate::GetMobileAvailable() {
- return true;
-}
-
bool TestSystemTrayDelegate::GetBluetoothAvailable() {
return true;
}
-bool TestSystemTrayDelegate::GetWifiEnabled() {
- return wifi_enabled_;
-}
-
-bool TestSystemTrayDelegate::GetMobileEnabled() {
- return cellular_enabled_;
-}
-
bool TestSystemTrayDelegate::GetBluetoothEnabled() {
return bluetooth_enabled_;
}
-bool TestSystemTrayDelegate::GetMobileScanSupported() {
- return true;
-}
-
bool TestSystemTrayDelegate::GetCellularCarrierInfo(std::string* carrier_id,
std::string* topup_url,
std::string* setup_url) {
return false;
}
-bool TestSystemTrayDelegate::GetWifiScanning() {
- return false;
-}
-
-bool TestSystemTrayDelegate::GetCellularInitializing() {
- return false;
-}
-
void TestSystemTrayDelegate::ShowCellularURL(const std::string& url) {
}
« no previous file with comments | « ash/system/tray/test_system_tray_delegate.h ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698