Rework a bit the NetworkList implementation.

chrome/browser/chromeos/login/network_screen.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/network_screen.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 19 matching lines @@
 NetworkScreen::~NetworkScreen() {
   UnsubscribeNetworkNotification();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ComboboxModel implementation:
 
 int NetworkScreen::GetItemCount() {
   // Item with index = 0 is either "no networks are available" or
   // "no selection".
-  return static_cast<int>(networks_.GetNetworkCount()) + 1;
+  return networks_.size() + 1;
 }
 
 std::wstring NetworkScreen::GetItemAt(int index) {
   if (index == 0) {
-    return networks_.IsEmpty() ?
+    return networks_.empty() ?
         l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE) :
         l10n_util::GetString(IDS_NETWORK_SELECTION_NONE);
   }
   NetworkList::NetworkItem* network =
       networks_.GetNetworkAt(index - 1);
   return network ? UTF16ToWide(network->label) : std::wstring();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::Combobox::Listener implementation:
 
 void NetworkScreen::ItemChanged(views::Combobox* sender,
                                 int prev_index,
                                 int new_index) {
   if (new_index == prev_index || new_index < 0 || prev_index < 0)
     return;
 
   // First item is a text, not a network.
   if (new_index == 0) {
     view()->SetSelectedNetworkItem(prev_index);
     return;
   }
 
-  if (networks_.IsEmpty())
+  if (networks_.empty())
     return;
 
   const NetworkList::NetworkItem* network =
       networks_.GetNetworkAt(new_index - 1);
   MessageLoop::current()->PostTask(FROM_HERE, task_factory_.NewRunnableMethod(
       &NetworkScreen::ConnectToNetwork, network->network_type, network->label));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::ButtonListener implementation:
@@ skipping 134 matching lines @@
                                   const string16& id) {
   int index = networks_.GetNetworkIndexById(type, id);
   if (index >= 0) {
     view()->SetSelectedNetworkItem(index + 1);
   } else {
     view()->SetSelectedNetworkItem(0);
   }
 }
 
 }  // namespace chromeos