Add CheckPortalList manager property to NetworkStateHandler

chromeos/network/network_state_handler.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 144 matching lines @@
   bool RequestUpdateForNetwork(const std::string& service_path);
 
   // Request an update for all existing NetworkState entries, e.g. after
   // loading an ONC configuration file that may have updated one or more
   // existing networks.
   void RequestUpdateForAllNetworks();
 
   // Set the user initiated connecting network.
   void SetConnectingNetwork(const std::string& service_path);
 
+  // Set the list of devices on which portal check is enabled.
+  void SetCheckPortalList(const std::string& check_portal_list);
+
   const std::string& connecting_network() const { return connecting_network_; }
+  const std::string& check_portal_list() const { return check_portal_list_; }
 
   // Generates a DictionaryValue of all NetworkState properties. Currently
   // provided for debugging purposes only.
   void GetNetworkStatePropertiesForTest(
       base::DictionaryValue* dictionary) const;
 
   // Construct and initialize an instance for testing.
   static NetworkStateHandler* InitializeForTest();
 
   static const char kMatchTypeDefault[];
   static const char kMatchTypeWireless[];
   static const char kMatchTypeMobile[];
   static const char kMatchTypeNonVirtual[];
 
+  // Default set of comma separated interfaces on which to enable
+  // portal checking.
+  static const char kDefaultCheckPortalList[];
+
  protected:
   friend class NetworkHandler;
   NetworkStateHandler();
 
   // ShillPropertyHandler::Listener overrides.
 
   // This adds new entries to the managed list specified by |type| and deletes
   // any entries that are no longer in the list.
   virtual void UpdateManagedList(ManagedState::ManagedType type,
                                  const base::ListValue& entries) OVERRIDE;
@@ skipping 14 matching lines @@
       const std::string& service_path,
       const std::string& key,
       const base::Value& value) OVERRIDE;
 
   // Called by ShillPropertyHandler when a watched device property changes.
   virtual void UpdateDeviceProperty(
       const std::string& device_path,
       const std::string& key,
       const base::Value& value) OVERRIDE;
 
+  // Called by ShillPropertyHandler when the portal check list manager property
+  // changes.
+  virtual void CheckPortalListChanged(
+      const std::string& check_portal_list) OVERRIDE;
+
   // Sends NetworkManagerChanged() to observers and logs an event.
   virtual void NotifyManagerPropertyChanged() OVERRIDE;
 
   // Called by |shill_property_handler_| when the service or device list has
   // changed and all entries have been updated. This updates the list and
   // notifies observers. If |type| == TYPE_NETWORK this also calls
   // CheckDefaultNetworkChanged().
   virtual void ManagedStateListChanged(
       ManagedState::ManagedType type) OVERRIDE;
 
@@ skipping 50 matching lines @@
 
   // Keeps track of the default network for notifying observers when it changes.
   std::string default_network_path_;
 
   // Convenience member to track the user initiated connecting network. Set
   // externally when a connection is requested and cleared here when the state
   // changes to something other than Connecting (after observers are notified).
   // TODO(stevenjb): Move this to NetworkConfigurationHandler.
   std::string connecting_network_;
 
+  // List of interfaces on which portal check is enabled.
+  std::string check_portal_list_;
+
   // Callbacks to run when a scan for the technology type completes.
   ScanCompleteCallbackMap scan_complete_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_