Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2693)

Unified Diff: chrome/browser/chromeos/login/network_screen.cc

Issue 1755021: Rework a bit the NetworkList implementation. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: " Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/network_list.h » ('j') | chrome/browser/chromeos/network_list.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « no previous file | chrome/browser/chromeos/network_list.h » ('j') | chrome/browser/chromeos/network_list.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698