Use ONC for Cellular APN and SimLock in Settings

chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

 // Copyright 2014 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 "chrome/browser/ui/webui/chromeos/network_config_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/login/login_state.h"
+#include "chromeos/network/device_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 142 matching lines @@
     NOTREACHED();
   }
   std::string service_path;
   if (!GetServicePathFromGuid(guid, &service_path)) {
     scoped_ptr<base::DictionaryValue> error_data;
     ErrorCallback(callback_id, "Error.InvalidNetworkGuid", error_data.Pass());
     return;
   }
   NetworkHandler::Get()->network_configuration_handler()->GetProperties(
       service_path,
-      base::Bind(&NetworkConfigMessageHandler::GetPropertiesSuccess,
+      base::Bind(&NetworkConfigMessageHandler::GetShillPropertiesSuccess,
                  weak_ptr_factory_.GetWeakPtr(), callback_id),
       base::Bind(&NetworkConfigMessageHandler::ErrorCallback,
                  weak_ptr_factory_.GetWeakPtr(), callback_id));
 }
 
+void NetworkConfigMessageHandler::GetShillPropertiesSuccess(
+    int callback_id,
+    const std::string& service_path,
+    const base::DictionaryValue& dictionary) const {
+  scoped_ptr<base::DictionaryValue> dictionary_copy(dictionary.DeepCopy());
+
+  // Get the device properties for debugging.
+  std::string device;
+  dictionary_copy->GetStringWithoutPathExpansion(
+      shill::kDeviceProperty, &device);
+  const DeviceState* device_state =
+      NetworkHandler::Get()->network_state_handler()->GetDeviceState(device);
+  if (device_state) {
+    base::DictionaryValue* device_dictionary =
+        device_state->properties().DeepCopy();
+    dictionary_copy->Set("Device", device_dictionary);

[pneubeck (no reviews), 2014/08/22 08:55:32]

nit: FWIW, in ManagedNetworkConfigurationHandlerImpl::GetPropertiesCallback, we
used shill::kDeviceProperty as key constant.

[stevenjb, 2014/08/22 17:08:43]

Done.

+  }
+  GetPropertiesSuccess(callback_id, service_path, *dictionary_copy);
+}
+
 void NetworkConfigMessageHandler::InvokeCallback(
     const base::ListValue& arg_list) const {
   web_ui()->CallJavascriptFunction(
       "networkConfig.chromeCallbackSuccess", arg_list);
 }
 
 void NetworkConfigMessageHandler::ErrorCallback(
     int callback_id,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) const {
   LOG(ERROR) << "NetworkConfigMessageHandler Error: " << error_name;
   base::ListValue arg_list;
   arg_list.AppendInteger(callback_id);
   arg_list.AppendString(error_name);
   web_ui()->CallJavascriptFunction(
       "networkConfig.chromeCallbackError", arg_list);
 }
 
 }  // namespace chromeos