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

Unified Diff: chromeos/network/managed_network_configuration_handler.h

Issue 23526016: Autoconnect policy for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed policy. Created 7 years, 2 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.h
diff --git a/chromeos/network/managed_network_configuration_handler.h b/chromeos/network/managed_network_configuration_handler.h
index 39107f851aa03ce08e9bf349020f2357e274eafd..ea7a446d7a84064a42f19595accdac46071e5756 100644
--- a/chromeos/network/managed_network_configuration_handler.h
+++ b/chromeos/network/managed_network_configuration_handler.h
@@ -101,15 +101,17 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandler {
const base::Closure& callback,
const network_handler::ErrorCallback& error_callback) const = 0;
- // Only to be called by NetworkConfigurationUpdater or from tests. Sets
- // |network_configs_onc| as the current policy of |onc_source|. The network
- // configurations of the policy will be applied (not necessarily immediately)
- // to Shill's profiles and enforced in future configurations until the policy
- // associated with |onc_source| is changed again with this function. For
- // device policies, |userhash| must be empty.
- virtual void SetPolicy(::onc::ONCSource onc_source,
- const std::string& userhash,
- const base::ListValue& network_configs_onc) = 0;
+ // Only to be called by NetworkConfigurationUpdater or from tests. Sets
+ // |network_configs_onc| and |global_network_config| as the current policy of
+ // |userhash| and |onc_source|. The policy will be applied (not necessarily
+ // immediately) to Shill's profiles and enforced in future configurations
+ // until the policy associated with |userhash| and |onc_source| is changed
+ // again with this function. For device policies, |userhash| must be empty.
+ virtual void SetPolicy(
+ ::onc::ONCSource onc_source,
+ const std::string& userhash,
+ const base::ListValue& network_configs_onc,
+ const base::DictionaryValue& global_network_config) = 0;
// Returns the user policy for user |userhash| or device policy, which has
// |guid|. If |userhash| is empty, only looks for a device policy. If such
« no previous file with comments | « chromeos/network/client_cert_resolver_unittest.cc ('k') | chromeos/network/managed_network_configuration_handler_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698