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

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

Index: chrome/browser/resources/options/chromeos/network_list.js
===================================================================
--- chrome/browser/resources/options/chromeos/network_list.js	(revision 222879)
+++ chrome/browser/resources/options/chromeos/network_list.js	(working copy)
@@ -112,6 +112,16 @@
   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.
@@ -463,7 +473,7 @@
 
         var label = enableDataRoaming_ ? 'disableDataRoaming' :
             'enableDataRoaming';
-        var disabled = !UIAccountTweaks.currentUserIsOwner();
+        var disabled = loggedInUserType_ != 'owner';
         var entry = {label: loadTimeData.getString(label),
                      data: {}};
         if (disabled) {
@@ -933,6 +943,14 @@
   };
 
   /**
+   * 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.