[Cros Network] Rename WiFi field name in GlobalPolicy and its reference
This CL rename two fields name in GlobalPolicy:
1. allow_only_policy_networks_to_connect to
allow_only_policy_wifi_networks_to_connect.
2. allow_only_policy_networks_to_connect_if_available to
allow_only_policy_wifi_networks_to_connect_if_available
since those fields only apply on the WiFi network policy.
Upstream CL: https://crrev.com/c/3063716
Bug: 1231305
Change-Id: I6bb8041895fa095e74d81eca1296ab2285992abe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3065059
Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Jason Zhang <jiajunz@google.com>
Cr-Commit-Position: refs/heads/master@{#909471}
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.js b/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.js
index 615c0aa..0e4be122 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.js
@@ -500,7 +500,7 @@
if (!this.deviceIsEnabled_(cellularDeviceState)) {
return false;
}
- return globalPolicy && !globalPolicy.allowOnlyPolicyNetworksToConnect;
+ return globalPolicy && !globalPolicy.allowOnlyPolicyCellularNetworks;
},
/**
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.js
index cba5667..66ac1ba 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.js
@@ -1230,8 +1230,8 @@
}
const hexSsid =
OncMojo.getActiveString(managedProperties.typeProperties.wifi.hexSsid);
- return !!globalPolicy.allowOnlyPolicyNetworksToConnect ||
- (!!globalPolicy.allowOnlyPolicyNetworksToConnectIfAvailable &&
+ return !!globalPolicy.allowOnlyPolicyWifiNetworksToConnect ||
+ (!!globalPolicy.allowOnlyPolicyWifiNetworksToConnectIfAvailable &&
!!managedNetworkAvailable) ||
(!!hexSsid && !!globalPolicy.blockedHexSsids &&
globalPolicy.blockedHexSsids.includes(hexSsid));
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js
index a62ed43f..a54762b 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js
@@ -817,8 +817,8 @@
return true;
}
- return !globalPolicy.allowOnlyPolicyNetworksToConnect &&
- (!globalPolicy.allowOnlyPolicyNetworksToConnectIfAvailable ||
+ return !globalPolicy.allowOnlyPolicyWifiNetworksToConnect &&
+ (!globalPolicy.allowOnlyPolicyWifiNetworksToConnectIfAvailable ||
!managedNetworkAvailable);
},
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js
index 4155626..8c2f11f3 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js
@@ -690,7 +690,7 @@
if (!this.deviceIsEnabled_(deviceState)) {
return false;
}
- return globalPolicy && !globalPolicy.allowOnlyPolicyNetworksToConnect;
+ return globalPolicy && !globalPolicy.allowOnlyPolicyWifiNetworksToConnect;
},
/**
@@ -812,8 +812,8 @@
this.isPolicySource(state.source) || !this.globalPolicy) {
return false;
}
- return !!this.globalPolicy.allowOnlyPolicyNetworksToConnect ||
- (!!this.globalPolicy.allowOnlyPolicyNetworksToConnectIfAvailable &&
+ return !!this.globalPolicy.allowOnlyPolicyWifiNetworksToConnect ||
+ (!!this.globalPolicy.allowOnlyPolicyWifiNetworksToConnectIfAvailable &&
!!this.deviceState && !!this.deviceState.managedNetworkAvailable) ||
(!!this.globalPolicy.blockedHexSsids &&
this.globalPolicy.blockedHexSsids.includes(
diff --git a/chrome/test/data/webui/chromeos/fake_network_config_mojom.js b/chrome/test/data/webui/chromeos/fake_network_config_mojom.js
index 8d6ca59..e58a6f1 100644
--- a/chrome/test/data/webui/chromeos/fake_network_config_mojom.js
+++ b/chrome/test/data/webui/chromeos/fake_network_config_mojom.js
@@ -112,8 +112,8 @@
/** @type {!chromeos.networkConfig.mojom.GlobalPolicy} */ ({
allow_only_policy_cellular_networks: false,
allow_only_policy_networks_to_autoconnect: false,
- allow_only_policy_networks_to_connect: false,
- allow_only_policy_networks_to_connect_if_available: false,
+ allow_only_policy_wifi_networks_to_connect: false,
+ allow_only_policy_wifi_networks_to_connect_if_available: false,
blocked_hex_ssids: [],
});
diff --git a/chrome/test/data/webui/settings/chromeos/cellular_networks_list_test.js b/chrome/test/data/webui/settings/chromeos/cellular_networks_list_test.js
index b9adc52..601d52e9 100644
--- a/chrome/test/data/webui/settings/chromeos/cellular_networks_list_test.js
+++ b/chrome/test/data/webui/settings/chromeos/cellular_networks_list_test.js
@@ -346,7 +346,7 @@
};
addESimSlot();
cellularNetworkList.globalPolicy = {
- allowOnlyPolicyNetworksToConnect: true,
+ allowOnlyPolicyCellularNetworks: true,
};
await flushAsync();
@@ -355,7 +355,7 @@
assertFalse(!!addESimButton);
cellularNetworkList.globalPolicy = {
- allowOnlyPolicyNetworksToConnect: false,
+ allowOnlyPolicyCellularNetworks: false,
};
await flushAsync();
diff --git a/chrome/test/data/webui/settings/chromeos/internet_subpage_tests.js b/chrome/test/data/webui/settings/chromeos/internet_subpage_tests.js
index 7f4830cf..e7202db 100644
--- a/chrome/test/data/webui/settings/chromeos/internet_subpage_tests.js
+++ b/chrome/test/data/webui/settings/chromeos/internet_subpage_tests.js
@@ -209,7 +209,7 @@
simInfos: [{eid: 'eid'}],
};
cellularNetworkList.globalPolicy = {
- allowOnlyPolicyNetworksToConnect: false,
+ allowOnlyPolicyWifiNetworksToConnect: false,
};
await flushAsync();
diff --git a/chromeos/services/network_config/cros_network_config.cc b/chromeos/services/network_config/cros_network_config.cc
index 6f129d4..62eee6e 100644
--- a/chromeos/services/network_config/cros_network_config.cc
+++ b/chromeos/services/network_config/cros_network_config.cc
@@ -2652,10 +2652,11 @@
result->allow_only_policy_networks_to_autoconnect = GetBoolean(
global_policy_dict,
::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect);
- result->allow_only_policy_networks_to_connect =
+ result->allow_only_policy_wifi_networks_to_connect =
GetBoolean(global_policy_dict,
::onc::global_network_config::kAllowOnlyPolicyWiFiToConnect);
- result->allow_only_policy_networks_to_connect_if_available = GetBoolean(
+ result
+ ->allow_only_policy_wifi_networks_to_connect_if_available = GetBoolean(
global_policy_dict,
::onc::global_network_config::kAllowOnlyPolicyWiFiToConnectIfAvailable);
absl::optional<std::vector<std::string>> blocked_hex_ssids = GetStringList(
diff --git a/chromeos/services/network_config/cros_network_config_unittest.cc b/chromeos/services/network_config/cros_network_config_unittest.cc
index bf51d3a7..244d799 100644
--- a/chromeos/services/network_config/cros_network_config_unittest.cc
+++ b/chromeos/services/network_config/cros_network_config_unittest.cc
@@ -1621,8 +1621,9 @@
ASSERT_TRUE(policy);
EXPECT_EQ(false, policy->allow_only_policy_cellular_networks);
EXPECT_EQ(true, policy->allow_only_policy_networks_to_autoconnect);
- EXPECT_EQ(false, policy->allow_only_policy_networks_to_connect);
- EXPECT_EQ(false, policy->allow_only_policy_networks_to_connect_if_available);
+ EXPECT_EQ(false, policy->allow_only_policy_wifi_networks_to_connect);
+ EXPECT_EQ(false,
+ policy->allow_only_policy_wifi_networks_to_connect_if_available);
ASSERT_EQ(2u, policy->blocked_hex_ssids.size());
EXPECT_EQ("blocked_ssid1", policy->blocked_hex_ssids[0]);
EXPECT_EQ("blocked_ssid2", policy->blocked_hex_ssids[1]);
diff --git a/chromeos/services/network_config/public/mojom/cros_network_config.mojom b/chromeos/services/network_config/public/mojom/cros_network_config.mojom
index d09ae88..667f71b 100644
--- a/chromeos/services/network_config/public/mojom/cros_network_config.mojom
+++ b/chromeos/services/network_config/public/mojom/cros_network_config.mojom
@@ -852,14 +852,14 @@
// If true, only policy networks may auto connect.
bool allow_only_policy_networks_to_autoconnect = false;
- // If true, only policy networks may be connected to and no new networks may
- // be added or configured.
- bool allow_only_policy_networks_to_connect = false;
+ // If true, only WiFi networks present in policy may be connected to and no
+ // new networks may be added or configured.
+ bool allow_only_policy_wifi_networks_to_connect = false;
// If true and a managed network is available in the visible network list,
- // only policy networks may be connected to and no new networks may be added
- // or configured.
- bool allow_only_policy_networks_to_connect_if_available = false;
+ // only WiFi networks present in policy may be connected to and no new
+ // networks may be added or configured.
+ bool allow_only_policy_wifi_networks_to_connect_if_available = false;
// List of blocked networks which can not be connected to.
array<string> blocked_hex_ssids;
diff --git a/ui/webui/resources/cr_components/chromeos/network/network_config.js b/ui/webui/resources/cr_components/chromeos/network/network_config.js
index a61b6df2..a6398e5 100644
--- a/ui/webui/resources/cr_components/chromeos/network/network_config.js
+++ b/ui/webui/resources/cr_components/chromeos/network/network_config.js
@@ -388,7 +388,7 @@
if (this.mojoType_ === mojom.NetworkType.kVPN ||
(this.globalPolicy_ &&
- this.globalPolicy_.allowOnlyPolicyNetworksToConnect)) {
+ this.globalPolicy_.allowOnlyPolicyWifiNetworksToConnect)) {
this.autoConnect_ = false;
} else {
this.autoConnect_ = true;
