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

Unified Diff: chromeos/network/network_state_handler.cc

Issue 210433002: Always list EthernetEAP as a Favorite for debugging (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 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 | « chromeos/network/managed_state.cc ('k') | chromeos/network/shill_property_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 42902d36a2a5a332919b422c9bfb070eacaef7ec..ec81bfaeae83a8a70f1f30aad284d5f255836414 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -304,7 +304,7 @@ void NetworkStateHandler::GetFavoriteListByType(const NetworkTypePattern& type,
iter != favorite_list_.end(); ++iter) {
const FavoriteState* favorite = (*iter)->AsFavoriteState();
DCHECK(favorite);
- if (favorite->update_received() && favorite->is_favorite() &&
+ if (favorite->update_received() && favorite->IsFavorite() &&
favorite->Matches(type)) {
list->push_back(favorite);
}
@@ -319,7 +319,7 @@ const FavoriteState* NetworkStateHandler::GetFavoriteState(
return NULL;
const FavoriteState* favorite = managed->AsFavoriteState();
DCHECK(favorite);
- if (!favorite->update_received() || !favorite->is_favorite())
+ if (!favorite->update_received() || !favorite->IsFavorite())
return NULL;
return favorite;
}
@@ -355,8 +355,9 @@ void NetworkStateHandler::RequestUpdateForNetwork(
void NetworkStateHandler::RequestUpdateForAllNetworks() {
NET_LOG_EVENT("RequestUpdateForAllNetworks", "");
- for (ManagedStateList::iterator iter = network_list_.begin();
- iter != network_list_.end(); ++iter) {
+ // Use favorite_list_ so that all services, visible and non, are updated.
+ for (ManagedStateList::iterator iter = favorite_list_.begin();
+ iter != favorite_list_.end(); ++iter) {
ManagedState* network = *iter;
network->set_update_requested(true);
shill_property_handler_->RequestProperties(
@@ -483,8 +484,8 @@ void NetworkStateHandler::UpdateManagedList(ManagedState::ManagedType type,
void NetworkStateHandler::ProfileListChanged() {
NET_LOG_EVENT("ProfileListChanged", "Re-Requesting Network Properties");
- for (ManagedStateList::iterator iter = network_list_.begin();
- iter != network_list_.end(); ++iter) {
+ for (ManagedStateList::iterator iter = favorite_list_.begin();
+ iter != favorite_list_.end(); ++iter) {
shill_property_handler_->RequestProperties(
ManagedState::MANAGED_TYPE_NETWORK, (*iter)->path());
}
@@ -510,7 +511,7 @@ void NetworkStateHandler::UpdateManagedStateProperties(
}
managed->set_update_received();
- std::string desc = GetManagedStateLogType(managed) + " PropertiesReceived";
+ std::string desc = GetManagedStateLogType(managed) + " Properties Received";
NET_LOG_DEBUG(desc, GetManagedStateLogName(managed));
if (type == ManagedState::MANAGED_TYPE_NETWORK) {
@@ -679,7 +680,7 @@ void NetworkStateHandler::ManagedStateListChanged(
for (ManagedStateList::iterator iter = favorite_list_.begin();
iter != favorite_list_.end(); ++iter) {
FavoriteState* favorite = (*iter)->AsFavoriteState();
- if (!favorite->is_favorite())
+ if (!favorite->IsFavorite())
continue;
if (favorite->IsPrivate())
++unshared;
« no previous file with comments | « chromeos/network/managed_state.cc ('k') | chromeos/network/shill_property_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698