MD Settings: Third party VPN support

ui/webui/resources/cr_elements/network/cr_onc_types.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview This file has two parts:
  *
  * 1. Typedefs for network properties. Note: These 'types' define a subset of
  * ONC properties in the ONC data dictionary. The first letter is capitalized to
  * match the ONC spec and avoid an extra layer of translation.
@@ skipping 296 matching lines @@
  * @return {boolean} The AutoConnect value if it exists or false.
  */
 CrOnc.getAutoConnect = function(properties) {
   var autoconnect = CrOnc.getManagedAutoConnect(properties);
   return !!CrOnc.getActiveValue(autoconnect);
 };
 
 /**
  * @param {!CrOnc.NetworkProperties|!CrOnc.NetworkStateProperties|undefined}
  *     properties The ONC network properties or state properties.
+ * @param {!Object} caller The caller, passed as 'this' to i18.

[michaelpg, 2016/09/06 21:22:08]

i18n

[michaelpg, 2016/09/06 21:22:09]

nit: this is normally called "context", as it's the context for the call to i18n
rather than the caller of i18n (which is CrOnc.getNetworkName)

[stevenjb, 2016/09/12 23:12:27]

Done.

[stevenjb, 2016/09/12 23:12:27]

Done.

  * @param {!Object<function(string, ...string):string>} i18n
  * @return {string} The name to display for |network|.
  */
-CrOnc.getNetworkName = function(properties, i18n) {
+CrOnc.getNetworkName = function(properties, caller, i18n) {
   if (!properties)
     return '';
   let name = CrOnc.getStateOrActiveString(properties.Name);
   let type = CrOnc.getStateOrActiveString(properties.Type);
   if (!name)
-    return i18n.call('OncType' + type);
+    return i18n.call(caller, 'OncType' + type);

[michaelpg, 2016/09/06 21:22:08]

actually, this function would be simpler if you simply took a {!I18nBehavior}:

return i18nBehavior.i18n('OncType' + type);

unfortunately I don't think Behaviors get recognized as types, but you can just
use the function decl you have as a field on an Object type.

[stevenjb, 2016/09/12 23:12:27]

OK, after a bit of wrangling I was able to define an I18nBehavior.Proto typedef.
LMKWYT.

   if (type == 'VPN' && properties.VPN) {
     let vpnType = CrOnc.getStateOrActiveString(properties.VPN.Type);
     if (vpnType == 'ThirdPartyVPN' && properties.VPN.ThirdPartyVPN) {
       let providerName = properties.VPN.ThirdPartyVPN.ProviderName;
       if (providerName)
-        return i18n.call('vpnNameTemplate', providerName, name);
+        return i18n.call(caller, 'vpnNameTemplate', providerName, name);
     }
   }
   return name;
 };
 
 /**
  * @param {!CrOnc.NetworkProperties|!CrOnc.NetworkStateProperties|undefined}
  *   properties The ONC network properties or state properties.
  * @return {boolean} True if |properties| is a Cellular network with a
  *   locked SIM.
@@ skipping 157 matching lines @@
       prefixLength += 1;
     } else if (token == '0') {
       prefixLength += 0;
     } else {
       // mask is not a valid number.
       return -1;
     }
   }
   return prefixLength;
 };