summaryrefslogtreecommitdiffstats
path: root/ui/chromeos
diff options
context:
space:
mode:
authorbartfab <bartfab@chromium.org>2015-03-17 11:01:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-17 18:02:31 +0000
commit99af3de35226ec378b60dbb89d69c331c8800b62 (patch)
tree4b3e7fd601b39291d625fb6af5bcbe0e0042d3d3 /ui/chromeos
parented6b0b9fb62994b34826a01118d574cec1561880 (diff)
downloadchromium_src-99af3de35226ec378b60dbb89d69c331c8800b62.zip
chromium_src-99af3de35226ec378b60dbb89d69c331c8800b62.tar.gz
chromium_src-99af3de35226ec378b60dbb89d69c331c8800b62.tar.bz2
Add ash::VPNDelegate and Chrome OS implementation
This CL is the first step toward support for third-party VPNs in ash UI. t adds a delegate interface that ash UI will use to retrieve the list of available VPN providers and request that a VPN provider show its "add network" dialog. The CL was tested together with follow-up CLs which wire up the actual UI. BUG=460428 TEST=Manual, together with follow-ups that wire up the UI Review URL: https://codereview.chromium.org/984863005 Cr-Commit-Position: refs/heads/master@{#320939}
Diffstat (limited to 'ui/chromeos')
-rw-r--r--ui/chromeos/ui_chromeos_strings.grd4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/chromeos/ui_chromeos_strings.grd b/ui/chromeos/ui_chromeos_strings.grd
index f1d1e1f..66b2fe1 100644
--- a/ui/chromeos/ui_chromeos_strings.grd
+++ b/ui/chromeos/ui_chromeos_strings.grd
@@ -482,7 +482,9 @@
<message name="IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION" desc="Message when attempting to activate a mobile network that requires a connection">
Activation of '<ph name="name">$1<ex>Generic Wireless</ex></ph>' requires a network connection.
</message>
-
+ <message name="IDS_NETWORK_VPN_BUILT_IN_PROVIDER" desc="The name of the built-in VPN provider that supports OpenVPN and L2TP over IPsec.">
+ OpenVPN / L2TP
+ </message>
</messages>
</release>
</grit>