chrome/browser/resources/options/chromeos/network_list.js - Issue 1006553002: Add third-party VPN support to network details dialog

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1006553002: Add third-party VPN support to network details dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_460428_add_ash_ui

Patch Set: Prepare for removal of GetManagedPropertiesResult() by tracking VPN providers and networks separate… Created 5 years, 9 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

« chrome/browser/resources/options/chromeos/internet_detail.js ('K') | « chrome/browser/resources/options/chromeos/internet_detail.js ('k') | chrome/browser/resources/options/chromeos/vpn_providers.js » ('j') | chrome/browser/resources/options/chromeos/vpn_providers.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/chromeos/network_list.js

diff --git a/chrome/browser/resources/options/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js

index 6c34bdf7661141558c10670f13ebf7dff514f637..a9817f6fa923b43b0da9bcb3f82da7dbc161f680 100644

--- a/chrome/browser/resources/options/chromeos/network_list.js

+++ b/chrome/browser/resources/options/chromeos/network_list.js

@@ -134,6 +134,10 @@ cr.define('options.network', function() {

function getNetworkName(data) {

if (data.Type == 'Ethernet')

return loadTimeData.getString('ethernetName');

+ if (data.Type == 'VPN') {

+ return options.VPNProviders.formatNetworkName(data.VPNProviderID,

+ data.Name);

+ }

return data.Name;

}