Better support for Cellular roaming state in ONC

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/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "chromeos/network/device_state.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_profile_handler.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/device_event_log/device_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
 
 const char kErrorUnknown[] = "Unknown";
@@ skipping 207 matching lines @@
     dictionary->SetStringWithoutPathExpansion(shill::kEapMethodProperty,
                                               eap_method());
   }
 
   // Mobile properties
   if (NetworkTypePattern::Mobile().MatchesType(type())) {
     dictionary->SetStringWithoutPathExpansion(shill::kNetworkTechnologyProperty,
                                               network_technology());
     dictionary->SetStringWithoutPathExpansion(shill::kActivationStateProperty,
                                               activation_state());
-    dictionary->SetStringWithoutPathExpansion(shill::kRoamingStateProperty,
-                                              roaming());
-    dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
-                                               cellular_out_of_credits());
+    if (NetworkTypePattern::Cellular().MatchesType(type())) {
+      dictionary->SetStringWithoutPathExpansion(shill::kRoamingStateProperty,
+                                                roaming());
+      dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
+                                                 cellular_out_of_credits());
+      // We need to set Device[Cellular.ProviderRequiresRoaming] so that
+        // the Shill -> ONC translation can provide 'ProviderRequiresRoaming'

[armansito, 2015/02/24 03:05:03]

nit: Is there an additional indentation here?

[stevenjb, 2015/02/24 16:31:18]

Done.

+      // to the UI for badging network icons.
+      const DeviceState* device =
+          NetworkHandler::Get()->network_state_handler()->GetDeviceState(
+              device_path_);
+      if (device) {
+        scoped_ptr<base::DictionaryValue> device_dict(
+            new base::DictionaryValue);
+        device_dict->SetBooleanWithoutPathExpansion(
+            shill::kProviderRequiresRoamingProperty,
+            device->provider_requires_roaming());
+        dictionary->SetWithoutPathExpansion(shill::kDeviceProperty,
+                                            device_dict.release());
+      }
+    }
   }
 }
 
 void NetworkState::IPConfigPropertiesChanged(
     const base::DictionaryValue& properties) {
   for (base::DictionaryValue::Iterator iter(properties); !iter.IsAtEnd();
        iter.Advance()) {
     std::string key = iter.key();
     const base::Value& value = iter.value();
 
@@ skipping 125 matching lines @@
   return IsCaptivePortalState(shill_properties, false /* log */);
 }
 
 // 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