Add CheckPortalList manager property to NetworkStateHandler

chromeos/network/network_state_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_state_handler.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 52 matching lines @@
 }
 
 }  // namespace
 
 namespace chromeos {
 
 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() {
 }
 
 NetworkStateHandler::~NetworkStateHandler() {
   STLDeleteContainerPointers(network_list_.begin(), network_list_.end());
   STLDeleteContainerPointers(device_list_.begin(), device_list_.end());
 }
 
 void NetworkStateHandler::InitShillPropertyHandler() {
@@ skipping 216 matching lines @@
 void NetworkStateHandler::SetConnectingNetwork(
     const std::string& service_path) {
   connecting_network_ = service_path;
   const NetworkState* network = GetNetworkState(service_path);
   if (network)
     NET_LOG_EVENT("SetConnectingNetwork", GetManagedStateLogName(network));
   else
     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();
        iter != network_list_.end(); ++iter) {
     base::DictionaryValue* network_dict = new base::DictionaryValue;
     (*iter)->AsNetworkState()->GetProperties(network_dict);
     dictionary->SetWithoutPathExpansion((*iter)->path(), network_dict);
   }
 }
 
@@ skipping 135 matching lines @@
   detail += " = " + network_event_log::ValueAsString(value);
   NET_LOG_EVENT("DevicePropertyUpdated", detail);
 
   FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_,
                     DeviceListChanged());
 
   if (key == flimflam::kScanningProperty && device->scanning() == false)
     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_,
                     NetworkManagerChanged());
 }
 
 void NetworkStateHandler::ManagedStateListChanged(
     ManagedState::ManagedType type) {
   if (type == ManagedState::MANAGED_TYPE_NETWORK) {
     // Notify observers that the list of networks has changed.
@@ skipping 129 matching lines @@
   }
   if (type == kMatchTypeDefault || type == kMatchTypeNonVirtual ||
       type == kMatchTypeWireless) {
     NOTREACHED();
     return flimflam::kTypeWifi;
   }
   return type;
 }
 
 }  // namespace chromeos