Rework a bit the NetworkList implementation.

chrome/browser/chromeos/network_list.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NETWORK_LIST_H_
 #define CHROME_BROWSER_CHROMEOS_NETWORK_LIST_H_
 
 #include <vector>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 29 matching lines @@
     NetworkType network_type;
     string16 label;      // string representation of the network (shown in UI).
     WifiNetwork wifi_network;
     CellularNetwork cellular_network;
     bool connected;
   };
 
   NetworkList();
   virtual ~NetworkList() {}
 
-  // True if network list is empty.
-  bool IsEmpty() const {
-    return networks_.empty();
-  }
-
   // Returns currently connected network if there is one.
   const NetworkList::NetworkItem* ConnectedNetwork() const;
 
   // Returns currently connecting network if there is one.
   const NetworkList::NetworkItem* ConnectingNetwork() const;
 
   // Returns network by it's type and ssid (Wifi) or id (Cellular).
   // If network is not available NULL is returned.
   const NetworkList::NetworkItem* GetNetworkById(NetworkType type,
                                                  const string16& id);
 
   // Returns network index by it's type and ssid (Wifi) or id (Cellular).
   // If network is not available -1 is returned.
   int GetNetworkIndexById(NetworkType type, const string16& id) const;
 
-  // Returns number of networks.
-  size_t GetNetworkCount() const {
-    return networks_.size();
-  }
-
   // Returns network by index.
   NetworkList::NetworkItem* GetNetworkAt(int index);
 
+  // Returns number of networks.
+  int size() const { return static_cast<int>(networks_.size()); }

[Nikita (slow), 2010/05/04 17:46:30]

I believe size() should still return size_t and when it's compared with int it's
better to leave static_cast<int>(...).

[tfarina (gmail-do not use), 2010/05/04 18:18:46]

Is better? Could you elaborate here?

(Why you would want to use static_cast everytime/everywhere?)

[Nikita (slow), 2010/05/05 13:41:40]

Argument was to use size_t for size() to keep consistency with the rest of
Chrome code base.
That leaves you with static_cast when comparing with int.

+
+  // True if network list is empty.
+  bool empty() const { return networks_.empty(); }
+
   // Callback from NetworkLibrary.
   void NetworkChanged(chromeos::NetworkLibrary* network_lib);
 
  private:
-  typedef std::vector<NetworkItem> NetworkItemVector;
-
   // Set connected/connecting network indices.
   // index - network index being processed
   void SetNetworksIndices(int index, bool connected, bool connecting);
 
+  typedef std::vector<NetworkItem> NetworkItemVector;
   // Cached list of all available networks.
   NetworkItemVector networks_;
 
   // Index of currently connected network or -1 if there's none.
   // If several networks are connected than single one is selected by priority:
   // Ethernet > WiFi > Cellular.
   int connected_network_index_;
 
   // Index of currently connecting network or -1 if there's none.
   int connecting_network_index_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkList);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NETWORK_LIST_H_