Merge FavoriteState into NetworkState

chrome/browser/resources/chromeos/network_ui/network_ui.js

 // Copyright 2013 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.
 
 var NetworkUI = (function() {
   'use strict';
 
   // Properties to display in the network state table. Each entry can be either
   // a single state field or an array of state fields. If more than one is
   // specified then the first non empty value is used.
@@ skipping 10 matching lines @@
     'Cellular.RoamingState',
     'Cellular.OutOfCredits',
     'WiFi.SignalStrength'
   ];
 
   var FAVORITE_STATE_FIELDS = [
     'GUID',
     'Name',
     'Type',
     'Profile',
+    'visible',
     'onc_source'
   ];
 
   var LOG_LEVEL_CLASSNAME = {
     'Error': 'network-log-level-error',
     'User': 'network-log-level-user',
     'Event': 'network-log-level-event',
     'Debug': 'network-log-level-debug'
   };
 
@@ skipping 228 matching lines @@
     chrome.send('NetworkUI.getNetworkLog');
   };
 
   /**
    * Requests an update of all network info.
    */
   var requestNetworks = function() {
     networkConfig.getNetworks(
         { 'type': 'All', 'visible': true },
         onVisibleNetworksReceived);
+    // TODO(stevenjb): Only request configured networks and remove 'visible'.
     networkConfig.getNetworks(
-        { 'type': 'All', 'configured': true },
+        { 'type': 'All', 'configured': false },
         onFavoriteNetworksReceived);
   };
 
   /**
    * Sets refresh rate if the interval is found in the url.
    */
   var setRefresh = function() {
     var interval = parseQueryParams(window.location)['refresh'];
     if (interval && interval != '')
       setInterval(requestNetworks, parseInt(interval) * 1000);
@@ skipping 18 matching lines @@
     $('log-timedetail').onclick = requestLog;
     setRefresh();
     requestLog();
     requestNetworks();
   });
 
   return {
     getNetworkLogCallback: getNetworkLogCallback
   };
 })();