Move network settings metrics to JS

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

 // Copyright (c) 2012 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.
 
 cr.define('options.network', function() {
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var List = cr.ui.List;
   var ListItem = cr.ui.ListItem;
   var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
   var Menu = cr.ui.Menu;
@@ skipping 99 matching lines @@
   function NetworkListItem(data) {
     var el = cr.doc.createElement('li');
     el.data_ = {};
     for (var key in data)
       el.data_[key] = data[key];
     NetworkListItem.decorate(el);
     return el;
   }
 
   /**
+   * @param {string} action An action to send to coreOptionsUserMetricsAction.
+   */
+  function sendChromeMetricsAction(action) {
+    chrome.send('coreOptionsUserMetricsAction', [action]);
+  }
+
+  /**
    * Decorate an element as a NetworkListItem.
    * @param {!Element} el The element to decorate.
    */
   NetworkListItem.decorate = function(el) {
     el.__proto__ = NetworkListItem.prototype;
     el.decorate();
   };
 
   NetworkListItem.prototype = {
     __proto__: ListItem.prototype,
@@ skipping 305 matching lines @@
      * @return {!Element} The newly created menu.
      */
     createMenu: function() {
       var menu = this.ownerDocument.createElement('div');
       menu.id = this.getMenuName();
       menu.className = 'network-menu';
       menu.hidden = true;
       Menu.decorate(menu);
       var addendum = [];
       if (this.data_.key == 'WiFi') {
-        addendum.push({label: loadTimeData.getString('joinOtherNetwork'),
-                       command: 'add',
-                       data: {Type: 'WiFi', servicePath: ''}});
+        addendum.push({
+          label: loadTimeData.getString('joinOtherNetwork'),
+          command: createAddConnectionCallback_('WiFi'),
+          data: {}
+        });
       } else if (this.data_.key == 'Cellular') {
         if (cellularEnabled_ && cellularSupportsScan_) {
-          entry = {
+          addendum.push({
             label: loadTimeData.getString('otherCellularNetworks'),
             command: createAddConnectionCallback_('Cellular'),
             addClass: ['other-cellulars'],
             data: {}
-          };
-          addendum.push(entry);
+          });
         }
 
         var label = enableDataRoaming_ ? 'disableDataRoaming' :
             'enableDataRoaming';
         var disabled = !loadTimeData.getValue('loggedInAsOwner');
         var entry = {label: loadTimeData.getString(label),
                      data: {}};
         if (disabled) {
           entry.command = null;
           entry.tooltip =
@@ skipping 10 matching lines @@
         }
         addendum.push(entry);
       }
       var list = this.data.rememberedNetworks;
       if (list && list.length > 0) {
         var callback = function(list) {
           $('remembered-network-list').clear();
           var dialog = options.PreferredNetworks.getInstance();
           PageManager.showPageByName('preferredNetworksPage', false);
           dialog.update(list);
-          chrome.send('coreOptionsUserMetricsAction',
-                      ['Options_NetworkShowPreferred']);
+          sendChromeMetricsAction('Options_NetworkShowPreferred');
         };
         addendum.push({label: loadTimeData.getString('preferredNetworks'),
                        command: callback,
                        data: list});
       }
 
       var networkGroup = this.ownerDocument.createElement('div');
       networkGroup.className = 'network-menu-group';
       list = this.data.networkList;
       var empty = !list || list.length == 0;
       if (list) {
         for (var i = 0; i < list.length; i++) {
           var data = list[i];
           this.createNetworkOptionsCallback_(networkGroup, data);
           if (data.ConnectionState == 'Connected') {
             if (data.Type == 'VPN') {
+              var disconnectCallback = function() {
+                sendChromeMetricsAction('Options_NetworkDisconnectVPN');
+                chrome.send('networkCommand',
+                            ['VPN', data.servicePath, 'disconnect']);
+              };
               // Add separator
               addendum.push({});
-              var i18nKey = 'disconnectNetwork';
-              addendum.push({label: loadTimeData.getString(i18nKey),
-                             command: 'disconnect',
+              addendum.push({label: loadTimeData.getString('disconnectNetwork'),
+                             command: disconnectCallback,
                              data: data});
             }
           }
         }
       }
       if (this.data_.key == 'WiFi' || this.data_.key == 'Wimax' ||
           this.data_.key == 'Cellular') {
         addendum.push({});
         if (this.data_.key == 'WiFi') {
           addendum.push({label: loadTimeData.getString('turnOffWifi'),
                        command: function() {
+                         sendChromeMetricsAction('Options_NetworkWifiToggle');
                          chrome.send('disableWifi');
                        },
                        data: {}});
         } else if (this.data_.key == 'Wimax') {
           addendum.push({label: loadTimeData.getString('turnOffWimax'),
                        command: function() {
                          chrome.send('disableWimax');
                        },
                        data: {}});
         } else if (this.data_.key == 'Cellular') {
@@ skipping 185 matching lines @@
 
     var buttonLabel = menu.ownerDocument.createElement('span');
     buttonLabel.className = 'network-menu-item-label';
     buttonLabel.textContent = label;
     button.appendChild(buttonLabel);
     var callback = null;
     if (typeof command == 'string') {
       var type = data.Type;
       var path = data.servicePath;
       callback = function() {
-        chrome.send('networkCommand',
-                    [type, path, command]);
+        chrome.send('networkCommand', [type, path, command]);
         closeMenu_();
       };
     } else if (command != null) {
       if (data) {
         callback = function() {
           (/** @type {Function} */(command))(data);
           closeMenu_();
         };
       } else {
         callback = function() {
@@ skipping 264 matching lines @@
     networkList.endBatchUpdates();
   };
 
   /**
    * Replaces a network menu with a button for reenabling the type of network.
    * @param {string} name The type of network (WiFi, Cellular or Wimax).
    * @param {string} command The command for reenabling the network.
    * @param {string} icon Type of icon (WiFi or Cellular).
    * @private
    */
-  function addEnableNetworkButton_(name, command, icon) {
+  function addEnableNetworkButton_(type, command, icon) {
     var subtitle = loadTimeData.getString('networkDisabled');
     var enableNetwork = function() {
+      if (type == 'WiFi')
+        sendChromeMetricsAction('Options_NetworkWifiToggle');
       chrome.send(command);
     };
     var networkList = $('network-list');
-    networkList.update({key: name,
+    networkList.update({key: type,
                         subtitle: subtitle,
                         iconType: icon,
                         command: enableNetwork});
   }
 
   /**
    * Element for indicating a policy managed network.
    * @constructor
    * @extends {options.ControlledSettingIndicator}
    */
@@ skipping 107 matching lines @@
   }
 
   /**
    * 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 createAddConnectionCallback_(type) {
     return function() {
+      if (type == 'WiFi')
+        sendChromeMetricsAction('Options_NetworkJoinOtherWifi');
+      else if (type == 'VPN')
+        sendChromeMetricsAction('Options_NetworkJoinOtherVPN');
       chrome.send('networkCommand', [type, '', 'add']);
     };
   }
 
   /**
    * Whether the Network list is disabled. Only used for display purpose.
    * @type {boolean}
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });