Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.h

Issue 1028243007: Call Device.SetCarrier when the ONC Carrier property is specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onc_clang
Patch Set: Fix components_unittests Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/managed_network_configuration_handler_impl.h
diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h
index 433987ce7d5566f641f22199ca9334d0ad6e163a..81e74f1c7d4bd69f926e1a91d63f64fd0ab3da3c 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.h
+++ b/chromeos/network/managed_network_configuration_handler_impl.h
@@ -56,7 +56,7 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
const std::string& service_path,
const base::DictionaryValue& user_settings,
const base::Closure& callback,
- const network_handler::ErrorCallback& error_callback) const override;
+ const network_handler::ErrorCallback& error_callback) override;
void CreateConfiguration(
const std::string& userhash,
@@ -179,6 +179,12 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
const std::string& error_name,
scoped_ptr<base::DictionaryValue> error_data);
+ // Called from SetProperties, calls NCH::SetShillProperties.
+ void SetShillProperties(const std::string& service_path,
+ scoped_ptr<base::DictionaryValue> shill_dictionary,
+ const base::Closure& callback,
+ const network_handler::ErrorCallback& error_callback);
+
// Applies policies for |userhash|. |modified_policies| must be not null and
// contain the GUIDs of the network configurations that changed since the last
// policy application. Returns true if policy application was started and

Powered by Google App Engine
This is Rietveld 408576698