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

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

Issue 2311473002: MD Settings: Third party VPN support (Closed)
Patch Set: Feedback Created 4 years, 3 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/internet_page.js
diff --git a/chrome/browser/resources/settings/internet_page/internet_page.js b/chrome/browser/resources/settings/internet_page/internet_page.js
index 143d03579eca174fa0f4ccd5b6de781f49959558..a6cc230139aee920f5f25276653320db1294ef2f 100644
--- a/chrome/browser/resources/settings/internet_page/internet_page.js
+++ b/chrome/browser/resources/settings/internet_page/internet_page.js
@@ -10,6 +10,8 @@
Polymer({
is: 'settings-internet-page',
+ behaviors: [I18nBehavior],
+
properties: {
/**
* Interface for networkingPrivate calls. May be overriden by tests.
@@ -34,6 +36,43 @@ Polymer({
type: Boolean,
value: false,
},
+
+ /**
+ * List of third party VPN providers.
+ * @type {!Array<!chrome.networkingPrivate.ThirdPartyVPNProperties>}
+ * @private
+ */
+ thirdPartyVpnProviders_: {
+ type: Array,
+ value: function() {
+ return [];
+ }
+ },
+ },
+
+ /** @override */
+ attached: function() {
+ chrome.management.onInstalled.addListener(
+ this.onExtensionAdded_.bind(this));
+ chrome.management.onEnabled.addListener(this.onExtensionAdded_.bind(this));
+ chrome.management.onUninstalled.addListener(
+ this.onExtensionRemoved_.bind(this));
+ chrome.management.onDisabled.addListener(
+ this.onExtensionDisabled_.bind(this));
+
+ chrome.management.getAll(this.onGetAllExtensions_.bind(this));
+ },
+
+ /** @override */
+ detached: function() {
+ chrome.management.onInstalled.removeListener(
+ this.onExtensionAdded_.bind(this));
+ chrome.management.onEnabled.removeListener(
+ this.onExtensionAdded_.bind(this));
+ chrome.management.onUninstalled.removeListener(
+ this.onExtensionRemoved_.bind(this));
+ chrome.management.onDisabled.removeListener(
+ this.onExtensionDisabled_.bind(this));
},
/**
@@ -66,13 +105,101 @@ Polymer({
this.addConnectionExpanded_ = !this.addConnectionExpanded_;
},
- /*** @private */
+ /** @private */
onAddWiFiTap_: function() {
chrome.send('addNetwork', [CrOnc.Type.WI_FI]);
},
- /*** @private */
+ /** @private */
onAddVPNTap_: function() {
chrome.send('addNetwork', [CrOnc.Type.VPN]);
},
+
+ /**
+ * @param {!{model:
+ * !{item: !chrome.networkingPrivate.ThirdPartyVPNProperties},
+ * }} event
michaelpg 2016/09/15 02:35:19 opt nit: I think the closing }} should align with
stevenjb 2016/09/15 18:01:20 Done.
+ * @private
+ */
+ onAddThirdPartyVpnTap_: function(event) {
+ let provider = event.model.item;
+ chrome.send('addNetwork', [CrOnc.Type.VPN, provider.ExtensionID]);
+ },
+
+ /**
+ * chrome.management.getAll callback.
+ * @param {!Array<!chrome.management.ExtensionInfo>} extensions
+ * @private
+ */
+ onGetAllExtensions_: function(extensions) {
+ let vpnProviders = [];
+ for (var extension of extensions)
+ this.addVpnProvider_(vpnProviders, extension);
+ this.thirdPartyVpnProviders_ = vpnProviders;
+ },
+
+ /**
+ * If |extension| is a third-party VPN provider, add it to |vpnProviders|.
+ * @param {!Array<!chrome.networkingPrivate.ThirdPartyVPNProperties>}
+ * vpnProviders
+ * @param {!chrome.management.ExtensionInfo} extension
+ * @private
+ */
+ addVpnProvider_: function(vpnProviders, extension) {
+ if (!extension.enabled ||
+ extension.permissions.indexOf('vpnProvider') == -1) {
+ return;
+ }
+ if (vpnProviders.find(function(provider) {
+ return provider.ExtensionID == extension.id;
+ })) {
+ return;
+ }
+ var newProvider = {
+ ExtensionID: extension.id,
+ ProviderName: extension.name,
+ };
+ vpnProviders.push(newProvider);
+ },
+
+ /**
+ * chrome.management.onInstalled or onEnabled event.
+ * @param {!chrome.management.ExtensionInfo} extension
+ * @private
+ */
+ onExtensionAdded_: function(extension) {
+ this.addVpnProvider_(this.thirdPartyVpnProviders_, extension);
+ },
+
+ /**
+ * chrome.management.onUninstalled event.
+ * @param {string} extensionId
+ * @private
+ */
+ onExtensionRemoved_: function(extensionId) {
+ for (var i = 0; i < this.thirdPartyVpnProviders_.length; ++i) {
+ var provider = this.thirdPartyVpnProviders_[i];
+ if (provider.ExtensionID == extensionId) {
+ this.splice('thirdPartyVpnProviders_', i, 1);
+ break;
+ }
+ }
+ },
+
+ /**
+ * chrome.management.onDisabled event.
+ * @param {{id: string}} extension
+ * @private
+ */
+ onExtensionDisabled_: function(extension) {
+ this.onExtensionRemoved_(extension.id);
+ },
+
+ /**
+ * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} provider
+ * @return {string}
+ */
+ getAddThirdParrtyVpnLabel_: function(provider) {
+ return this.i18n('internetAddThirdPartyVPN', provider.ProviderName);
+ }
});

Powered by Google App Engine
This is Rietveld 408576698