Merge 222390 "network_list.js should reflect the correct logged ..."

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;
@@ skipping 94 matching lines @@
   var enableDataRoaming_ = false;
 
   /**
    * Icon to use when not connected to a particular type of network.
    * @type {!Object.<string, string>} Mapping of network type to icon data url.
    * @private
    */
   var defaultIcons_ = {};
 
   /**
+   * Contains the current logged in user type, which is one of 'none',
+   * 'regular', 'owner', 'guest', 'retail-mode', 'public-account',
+   * 'locally-managed', and 'kiosk-app', or empty string if the data has not
+   * been set.
+   * @type {string}
+   * @private
+   */
+  var loggedInUserType_ = '';
+
+  /**
    * Create an element in the network list for controlling network
    * connectivity.
    * @param {Object} data Description of the network list or command.
    * @constructor
    */
   function NetworkListItem(data) {
     var el = cr.doc.createElement('li');
     el.data_ = {};
     for (var key in data)
       el.data_[key] = data[key];
@@ skipping 331 matching lines @@
             label: loadTimeData.getString('otherCellularNetworks'),
             command: createAddConnectionCallback_(Constants.TYPE_CELLULAR),
             addClass: ['other-cellulars'],
             data: {}
           };
           addendum.push(entry);
         }
 
         var label = enableDataRoaming_ ? 'disableDataRoaming' :
             'enableDataRoaming';
-        var disabled = !UIAccountTweaks.currentUserIsOwner();
+        var disabled = loggedInUserType_ != 'owner';
         var entry = {label: loadTimeData.getString(label),
                      data: {}};
         if (disabled) {
           entry.command = null;
           entry.tooltip =
               loadTimeData.getString('dataRoamingDisableToggleTooltip');
         } else {
           var self = this;
           entry.command = function() {
             options.Preferences.setBooleanPref(
@@ skipping 449 matching lines @@
   /**
    * Sets the default icon to use for each network type if disconnected.
    * @param {!Object.<string, string>} data Mapping of network type to icon
    *     data url.
    */
   NetworkList.setDefaultNetworkIcons = function(data) {
     defaultIcons_ = Object.create(data);
   };
 
   /**
+   * Sets the current logged in user type.
+   * @param {string} userType Current logged in user type.
+   */
+  NetworkList.updateLoggedInUserType = function(userType) {
+    loggedInUserType_ = String(userType);
+  };
+
+  /**
    * Chrome callback for updating network controls.
    * @param {Object} data Description of available network devices and their
    *     corresponding state.
    */
   NetworkList.refreshNetworkData = function(data) {
     var networkList = $('network-list');
     networkList.startBatchUpdates();
     cellularAvailable_ = data.cellularAvailable;
     cellularEnabled_ = data.cellularEnabled;
     cellularSupportsScan_ = data.cellularSupportsScan;
@@ skipping 211 matching lines @@
    * 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
   };
 });