Commit a036cfdc authored by Anand K Mistry's avatar Anand K Mistry Committed by Commit Bot

Convert chromeos::onc::Translate* arguments to new-style base::Value

This only changes the argument types, not the return type, which will
be updated in a follow-up change.

Bug: 646113
Change-Id: Idea5cc9bddf13143720aaba17cf43e36b5bf8e7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291294
Commit-Queue: Anand K Mistry <amistry@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787639}
parent 3a3bbc54
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
namespace base { namespace base {
class DictionaryValue; class DictionaryValue;
class Value;
} }
namespace chromeos { namespace chromeos {
...@@ -22,21 +23,21 @@ namespace onc { ...@@ -22,21 +23,21 @@ namespace onc {
struct OncValueSignature; struct OncValueSignature;
// Translates a hierarchical ONC dictionary |onc_object| to a flat Shill // Translates a hierarchical ONC dictionary |onc_object| (a Value of type
// dictionary. The |signature| declares the type of |onc_object| and must point // DICTIONARY) to a flat Shill dictionary. The |signature| declares the type of
// to one of the signature objects in "onc_signature.h". The resulting Shill // |onc_object| and must point to one of the signature objects in
// dictionary is returned. // "onc_signature.h". The resulting Shill dictionary is returned.
// //
// This function is used to translate network settings from ONC to Shill's // This function is used to translate network settings from ONC to Shill's
// format before sending them to Shill. // format before sending them to Shill.
COMPONENT_EXPORT(CHROMEOS_NETWORK) COMPONENT_EXPORT(CHROMEOS_NETWORK)
std::unique_ptr<base::DictionaryValue> TranslateONCObjectToShill( std::unique_ptr<base::DictionaryValue> TranslateONCObjectToShill(
const OncValueSignature* signature, const OncValueSignature* signature,
const base::DictionaryValue& onc_object); const base::Value& onc_object);
// Translates a |shill_dictionary| to an ONC object according to the given // Translates a |shill_dictionary| (a Value of type DICTIONARY) to an ONC object
// |onc_signature|. |onc_signature| must point to a signature object in // according to the given |onc_signature|. |onc_signature| must point to a
// "onc_signature.h". The resulting ONC object is returned. // signature object in "onc_signature.h". The resulting ONC object is returned.
// //
// This function is used to translate network settings coming from Shill to ONC // This function is used to translate network settings coming from Shill to ONC
// before sending them to the UI. The result doesn't have to be valid ONC, but // before sending them to the UI. The result doesn't have to be valid ONC, but
...@@ -48,7 +49,7 @@ std::unique_ptr<base::DictionaryValue> TranslateONCObjectToShill( ...@@ -48,7 +49,7 @@ std::unique_ptr<base::DictionaryValue> TranslateONCObjectToShill(
// be set. // be set.
COMPONENT_EXPORT(CHROMEOS_NETWORK) COMPONENT_EXPORT(CHROMEOS_NETWORK)
std::unique_ptr<base::DictionaryValue> TranslateShillServiceToONCPart( std::unique_ptr<base::DictionaryValue> TranslateShillServiceToONCPart(
const base::DictionaryValue& shill_dictionary, const base::Value& shill_dictionary,
::onc::ONCSource onc_source, ::onc::ONCSource onc_source,
const OncValueSignature* onc_signature, const OncValueSignature* onc_signature,
const NetworkState* network_state); const NetworkState* network_state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment