Add 'setProperties' to InternetOptionsHandler

chromeos/network/network_state.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.h"
 
 #include "base/strings/stringprintf.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_type_pattern.h"
@@ skipping 157 matching lines @@
   if ((type() == shill::kTypeWifi || type() == shill::kTypeWimax) &&
       visible() && signal_strength_ <= 0) {
       signal_strength_ = 1;
   }
 
   return changed;
 }
 
 void NetworkState::GetStateProperties(base::DictionaryValue* dictionary) const {
   ManagedState::GetStateProperties(dictionary);
+  GetNetworkStateProperties(dictionary);
+  if (visible())
+    GetVisibleStateProperties(dictionary);
+}
 
-  // Properties shared by all types.
+void NetworkState::GetConfigurationStateProperties(
+    base::DictionaryValue* dictionary) const {
+  ManagedState::GetStateProperties(dictionary);
+  GetNetworkStateProperties(dictionary);
+}
+
+void NetworkState::GetNetworkStateProperties(
+    base::DictionaryValue* dictionary) const {
   dictionary->SetStringWithoutPathExpansion(shill::kGuidProperty, guid());
   dictionary->SetStringWithoutPathExpansion(shill::kSecurityProperty,
                                             security());
 
-  if (visible()) {
-    if (!error().empty())
-      dictionary->SetStringWithoutPathExpansion(shill::kErrorProperty, error());
-    dictionary->SetStringWithoutPathExpansion(shill::kStateProperty,
-                                              connection_state());
-  }
-
-  // Wireless properties
-  if (!NetworkTypePattern::Wireless().MatchesType(type()))
-    return;
-
-  if (visible()) {
-    dictionary->SetBooleanWithoutPathExpansion(shill::kConnectableProperty,
-                                               connectable());
-    dictionary->SetIntegerWithoutPathExpansion(shill::kSignalStrengthProperty,
-                                               signal_strength());
-  }
-
   // Wifi properties
   if (NetworkTypePattern::WiFi().MatchesType(type())) {
     dictionary->SetStringWithoutPathExpansion(shill::kEapMethodProperty,
                                               eap_method());
   }
 
   // Mobile properties
   if (NetworkTypePattern::Mobile().MatchesType(type())) {
     dictionary->SetStringWithoutPathExpansion(
         shill::kNetworkTechnologyProperty,
         network_technology());
+  }
+}
+
+void NetworkState::GetVisibleStateProperties(
+    base::DictionaryValue* dictionary) const {
+  dictionary->SetStringWithoutPathExpansion(shill::kStateProperty,
+                                            connection_state());
+  if (!error().empty())
+    dictionary->SetStringWithoutPathExpansion(shill::kErrorProperty, error());
+
+  // Wireless properties
+  if (NetworkTypePattern::Wireless().MatchesType(type())) {
+    dictionary->SetBooleanWithoutPathExpansion(shill::kConnectableProperty,
+                                               connectable());
+    dictionary->SetIntegerWithoutPathExpansion(shill::kSignalStrengthProperty,
+                                               signal_strength());
+  }
+
+  // Mobile properties
+  if (NetworkTypePattern::Mobile().MatchesType(type())) {
     dictionary->SetStringWithoutPathExpansion(shill::kActivationStateProperty,
                                               activation_state());
     dictionary->SetStringWithoutPathExpansion(shill::kRoamingStateProperty,
                                               roaming());
     dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
                                                cellular_out_of_credits());
   }
 }
 
 void NetworkState::IPConfigPropertiesChanged(
@@ skipping 121 matching lines @@
           connection_state == shill::kStateCarrier);
 }
 
 // static
 bool NetworkState::ErrorIsValid(const std::string& error) {
   // Shill uses "Unknown" to indicate an unset or cleared error state.
   return !error.empty() && error != kErrorUnknown;
 }
 
 }  // namespace chromeos