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

Unified Diff: chrome/browser/resources/settings/internet_page/network_summary.js

Issue 2624573002: MD Settings: Internet: UI For global policy (Closed)
Patch Set: Rebase + Wrap Created 3 years, 11 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
Index: chrome/browser/resources/settings/internet_page/network_summary.js
diff --git a/chrome/browser/resources/settings/internet_page/network_summary.js b/chrome/browser/resources/settings/internet_page/network_summary.js
index d2950a375cd805ac73b322efe238ec03b7fa031b..40350487918671c70b71abdb1676bd17759b6a48 100644
--- a/chrome/browser/resources/settings/internet_page/network_summary.js
+++ b/chrome/browser/resources/settings/internet_page/network_summary.js
@@ -35,6 +35,8 @@ var NetworkStateListObject;
Polymer({
is: 'network-summary',
+ behaviors: [CrPolicyNetworkBehavior],
+
properties: {
/**
* Highest priority connected network or null.
@@ -46,6 +48,9 @@ Polymer({
notify: true,
},
+ /** @type {!chrome.networkingPrivate.GlobalPolicy|undefined} */
+ globalPolicy: Object,
+
/**
* Interface for networkingPrivate calls, passed from internet_page.
* @type {NetworkingPrivate}
@@ -167,7 +172,7 @@ Polymer({
*/
onSelected_: function(event) {
var state = event.detail;
- if (this.canConnect_(state)) {
+ if (this.canConnect_(state, this.globalPolicy)) {
this.connectToNetwork_(state);
return;
}
@@ -223,13 +228,19 @@ Polymer({
/**
* Determines whether or not a network state can be connected to.
* @param {!CrOnc.NetworkStateProperties} state The network state.
+ * @param {!chrome.networkingPrivate.GlobalPolicy|undefined} globalPolicy
* @private
*/
- canConnect_: function(state) {
+ canConnect_: function(state, globalPolicy) {
if (state.Type == CrOnc.Type.ETHERNET ||
state.Type == CrOnc.Type.VPN && !this.defaultNetwork) {
return false;
}
+ if (state.Type == CrOnc.Type.WI_FI && !!globalPolicy &&
+ globalPolicy.AllowOnlyPolicyNetworksToConnect &&
+ !this.isPolicySource(state.Source)) {
+ return false;
+ }
return state.ConnectionState == CrOnc.ConnectionState.NOT_CONNECTED;
},

Powered by Google App Engine
This is Rietveld 408576698