| Index: chrome/browser/chromeos/login/network_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
|
| index c0c86bb1086de624eac46f58efb4ddbc49b35583..50895fd103ea28cdd80bc26d7c45081005c569e6 100644
|
| --- a/chrome/browser/chromeos/login/network_screen.cc
|
| +++ b/chrome/browser/chromeos/login/network_screen.cc
|
| @@ -37,12 +37,12 @@ NetworkScreen::~NetworkScreen() {
|
| 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);
|
| }
|
| @@ -66,7 +66,7 @@ void NetworkScreen::ItemChanged(views::Combobox* sender,
|
| return;
|
| }
|
|
|
| - if (networks_.IsEmpty())
|
| + if (networks_.empty())
|
| return;
|
|
|
| const NetworkList::NetworkItem* network =
|
|
|