| Index: chromeos/network/network_state_handler.cc
|
| diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
|
| index 053a932e46bfbd417f134c4830a2b4407ebedce4..763c7fccaaea1a0cd54dd55a6bc1cc1b423e9d68 100644
|
| --- a/chromeos/network/network_state_handler.cc
|
| +++ b/chromeos/network/network_state_handler.cc
|
| @@ -70,6 +70,8 @@ const char NetworkStateHandler::kMatchTypeDefault[] = "default";
|
| const char NetworkStateHandler::kMatchTypeWireless[] = "wireless";
|
| const char NetworkStateHandler::kMatchTypeMobile[] = "mobile";
|
| const char NetworkStateHandler::kMatchTypeNonVirtual[] = "non-virtual";
|
| +const char NetworkStateHandler::kDefaultCheckPortalList[] =
|
| + "ethernet,wifi,cellular";
|
|
|
| NetworkStateHandler::NetworkStateHandler() {
|
| }
|
| @@ -306,6 +308,12 @@ void NetworkStateHandler::SetConnectingNetwork(
|
| NET_LOG_ERROR("SetConnectingNetwork to unknown network", service_path);
|
| }
|
|
|
| +void NetworkStateHandler::SetCheckPortalList(
|
| + const std::string& check_portal_list) {
|
| + NET_LOG_EVENT("SetCheckPortalList", check_portal_list);
|
| + shill_property_handler_->SetCheckPortalList(check_portal_list);
|
| +}
|
| +
|
| void NetworkStateHandler::GetNetworkStatePropertiesForTest(
|
| base::DictionaryValue* dictionary) const {
|
| for (ManagedStateList::const_iterator iter = network_list_.begin();
|
| @@ -461,6 +469,11 @@ void NetworkStateHandler::UpdateDeviceProperty(const std::string& device_path,
|
| ScanCompleted(device->type());
|
| }
|
|
|
| +void NetworkStateHandler::CheckPortalListChanged(
|
| + const std::string& check_portal_list) {
|
| + check_portal_list_ = check_portal_list;
|
| +}
|
| +
|
| void NetworkStateHandler::NotifyManagerPropertyChanged() {
|
| NET_LOG_DEBUG("NotifyManagerPropertyChanged", "");
|
| FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_,
|
|
|