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

Unified Diff: chrome/browser/resources/options/chromeos/internet_detail.js

Issue 1166763003: Do not always attempt to configure third party VPNs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/chromeos/internet_detail.js
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js
index 449ee3725eaa991f393ad43f5bd9379b1e3d12b2..fc25e63fc060a0759e33032767cbdee6f74d151e 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options/chromeos/internet_detail.js
@@ -1228,11 +1228,14 @@ cr.define('options.internet', function() {
var guid = onc.guid();
var type = onc.getActiveValue('Type');
- // VPNs do not correctly set 'Connectable', so we always show the
+ // Built-in VPNs do not correctly set 'Connectable', so we always show the
// configuration UI.
if (type == 'VPN') {
- chrome.send('configureNetwork', [guid]);
- return;
+ if ((onc.getActiveValue('VPN.Type') != 'ThirdPartyVPN') ||
+ !onc.getActiveValue('Connectable')) {
bartfab (slow) 2015/06/02 23:55:26 The first part of the conditional makes sense of c
stevenjb 2015/06/03 01:14:57 I guess the thing to do is to disable the Connect
+ chrome.send('configureNetwork', [guid]);
+ return;
+ }
}
// If 'Connectable' is false for WiFi or WiMAX, Shill requires
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698