| 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..d754bbb16e83bd13e96bd233ab25a728cf0da366 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;
|
| }
|
| @@ -353,17 +353,6 @@ void NetworkStateHandler::RequestUpdateForNetwork(
|
| ManagedState::MANAGED_TYPE_NETWORK, service_path);
|
| }
|
|
|
| -void NetworkStateHandler::RequestUpdateForAllNetworks() {
|
| - NET_LOG_EVENT("RequestUpdateForAllNetworks", "");
|
| - for (ManagedStateList::iterator iter = network_list_.begin();
|
| - iter != network_list_.end(); ++iter) {
|
| - ManagedState* network = *iter;
|
| - network->set_update_requested(true);
|
| - shill_property_handler_->RequestProperties(
|
| - ManagedState::MANAGED_TYPE_NETWORK, network->path());
|
| - }
|
| -}
|
| -
|
| void NetworkStateHandler::ClearLastErrorForNetwork(
|
| const std::string& service_path) {
|
| NetworkState* network = GetModifiableNetworkState(service_path);
|
| @@ -483,8 +472,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 +499,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 +668,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;
|
|
|