Revert of Allow users to add third-party VPNs from the settings page

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

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 e3629bb964c99bd3f38cec4c026bf72e8c4e0b78..09e1a6a10b6bba945a352ae0de0291353c0ddc99 100644
--- a/chrome/browser/resources/options/chromeos/network_list.js
+++ b/chrome/browser/resources/options/chromeos/network_list.js
@@ -375,26 +375,8 @@
       return null;
     },
 
-    /**
-     * Determines if a menu can be updated on the fly. Menus that cannot be
-     * updated are fully regenerated using createMenu. The advantage of
-     * updating a menu is that it can preserve ordering of networks avoiding
-     * entries from jumping around after an update.
-     * @return {boolean} Whether the menu can be updated on the fly.
-     */
     canUpdateMenu: function() {
       return false;
-    },
-
-    /**
-     * Removes the current menu contents, causing it to be regenerated when the
-     * menu is shown the next time. If the menu is showing right now, its
-     * contents are regenerated immediately and the menu remains visible.
-     */
-    refreshMenu: function() {
-      this.menu_ = null;
-      if (activeMenu_ == this.getMenuName())
-        this.showMenu();
     },
 
     /**
@@ -411,7 +393,7 @@
         rebuild = true;
         var existing = $(this.getMenuName());
         if (existing) {
-          if (this.canUpdateMenu() && this.updateMenu())
+          if (this.updateMenu())
             return;
           closeMenu_();
         }
@@ -515,14 +497,14 @@
       if (this.data_.key == 'WiFi') {
         addendum.push({
           label: loadTimeData.getString('joinOtherNetwork'),
-          command: createAddNonVPNConnectionCallback_('WiFi'),
+          command: createAddConnectionCallback_('WiFi'),
           data: {}
         });
       } else if (this.data_.key == 'Cellular') {
         if (cellularEnabled_ && cellularSupportsScan_) {
           addendum.push({
             label: loadTimeData.getString('otherCellularNetworks'),
-            command: createAddNonVPNConnectionCallback_('Cellular'),
+            command: createAddConnectionCallback_('Cellular'),
             addClass: ['other-cellulars'],
             data: {}
           });
@@ -549,7 +531,11 @@
         }
         addendum.push(entry);
       } else if (this.data_.key == 'VPN') {
-        addendum = addendum.concat(createAddVPNConnectionEntries_());
+        addendum.push({
+          label: loadTimeData.getString('joinOtherNetwork'),
+          command: createAddConnectionCallback_('VPN'),
+          data: {}
+        });
       }
 
       var list = this.data.rememberedNetworks;
@@ -648,7 +634,12 @@
       return menu;
     },
 
-    /** @override */
+    /**
+     * Determines if a menu can be updated on the fly. Menus that cannot be
+     * updated are fully regenerated using createMenu. The advantage of
+     * updating a menu is that it can preserve ordering of networks avoiding
+     * entries from jumping around after an update.
+     */
     canUpdateMenu: function() {
       return this.data_.key == 'WiFi' && activeMenu_ == this.getMenuName();
     },
@@ -659,11 +650,12 @@
      * preferred ordering as determined by the network library.  If the
      * ordering becomes potentially out of sync, then the updated menu is
      * marked for disposal on close.  Reopening the menu will force a
-     * regeneration, which will in turn fix the ordering. This method must only
-     * be called if canUpdateMenu() returned |true|.
+     * regeneration, which will in turn fix the ordering.
      * @return {boolean} True if successfully updated.
      */
     updateMenu: function() {
+      if (!this.canUpdateMenu())
+        return false;
       var oldMenu = $(this.getMenuName());
       var group = oldMenu.getElementsByClassName('network-menu-group')[0];
       if (!group)
@@ -850,7 +842,18 @@
       // Wi-Fi control is always visible.
       this.update({key: 'WiFi', networkList: []});
 
-      this.updateAddConnectionMenuEntries_();
+      var entryAddWifi = {
+        label: loadTimeData.getString('addConnectionWifi'),
+        command: createAddConnectionCallback_('WiFi')
+      };
+      var entryAddVPN = {
+        label: loadTimeData.getString('addConnectionVPN'),
+        command: createAddConnectionCallback_('VPN')
+      };
+      this.update({key: 'addConnection',
+                   iconType: 'add-connection',
+                   menu: [entryAddWifi, entryAddVPN]
+                  });
 
       var prefs = options.Preferences.getInstance();
       prefs.addEventListener('cros.signed.data_roaming_enabled',
@@ -858,43 +861,6 @@
             enableDataRoaming_ = event.value.value;
           });
       this.endBatchUpdates();
-
-      options.VPNProviders.addObserver(this.onVPNProvidersChanged_.bind(this));
-    },
-
-    /**
-     * Called when the list of VPN providers changes. Refreshes the contents of
-     * menus that list VPN providers.
-     * @private
-     */
-    onVPNProvidersChanged_() {
-      // Refresh the contents of the VPN menu.
-      var index = this.indexOf('VPN');
-      if (index != undefined)
-        this.getListItemByIndex(index).refreshMenu();
-
-      // Refresh the contents of the "add connection" menu.
-      this.updateAddConnectionMenuEntries_();
-      index = this.indexOf('addConnection');
-      if (index != undefined)
-        this.getListItemByIndex(index).refreshMenu();
-    },
-
-    /**
-     * Updates the entries in the "add connection" menu, based on the VPN
-     * providers currently enabled in the primary user's profile.
-     * @private
-     */
-    updateAddConnectionMenuEntries_() {
-      var entries = [{
-        label: loadTimeData.getString('addConnectionWifi'),
-        command: createAddNonVPNConnectionCallback_('WiFi')
-      }];
-      entries = entries.concat(createAddVPNConnectionEntries_());
-      this.update({key: 'addConnection',
-                   iconType: 'add-connection',
-                   menu: entries
-                  });
     },
 
     /**
@@ -1252,69 +1218,19 @@
   }
 
   /**
-   * Creates a callback function that adds a new connection of the given type.
-   * This method may be used for all network types except VPN.
+   * Create a callback function that adds a new connection of the given type.
    * @param {string} type An ONC network type
    * @return {function()} The created callback.
    * @private
    */
-  function createAddNonVPNConnectionCallback_(type) {
+  function createAddConnectionCallback_(type) {
     return function() {
       if (type == 'WiFi')
         sendChromeMetricsAction('Options_NetworkJoinOtherWifi');
-      chrome.send('addNonVPNConnection', [type]);
+      else if (type == 'VPN')
+        sendChromeMetricsAction('Options_NetworkJoinOtherVPN');
+      chrome.send('addConnection', [type]);
     };
-  }
-
-  /**
-   * Creates a callback function that shows the "add network" dialog for the
-   * built-in OpenVPN/L2TP VPN provider.
-   * @return {function()} The created callback.
-   * @private
-   */
-  function createVPNConnectionWithAddBuiltInProviderCallback_() {
-    return function() {
-      sendChromeMetricsAction('Options_NetworkAddVPNBuiltIn');
-      chrome.send('addVPNConnection');
-    };
-  }
-
-  /**
-   * Creates a callback function that asks the third-party VPN provider
-   * identified by |extensionID| to show its "add network" dialog.
-   * @param {string} providerID The VPN provider's extension ID.
-   * @return {function()} The created callback.
-   * @private
-   */
-  function createAddVPNConnectionWithThirdPartyProviderCallback_(extensionID) {
-    return function() {
-      sendChromeMetricsAction('Options_NetworkAddVPNThirdParty');
-      chrome.send('addVPNConnection', [extensionID]);
-    };
-  }
-
-  /**
-   * Generates an "add network" entry for each VPN provider currently enabled in
-   * the primary user's profile.
-   * @return {!Array<{label: string, command: function(), data: !Object}>} The
-   *     list of entries.
-   * @private
-   */
-  function createAddVPNConnectionEntries_() {
-    var entries = [];
-    var providers = options.VPNProviders.getProviders();
-    for (var i = 0; i < providers.length; ++i) {
-      entries.push({
-        label: loadTimeData.getStringF('addConnectionVPNTemplate',
-                                       providers[i].name),
-        command: providers[i].extensionID ?
-            createAddVPNConnectionWithThirdPartyProviderCallback_(
-                providers[i].extensionID) :
-            createVPNConnectionWithAddBuiltInProviderCallback_(),
-        data: {}
-      });
-    }
-    return entries;
   }
 
   /**