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

Side by Side Diff: chromeos/network/managed_network_configuration_handler.h

Issue 2754903002: Prevent networkingPrivate.forgetNetwork from removing shared configs (Closed)
Patch Set: . Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_
6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_ 6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // Removes the user's configuration from the network with |service_path|. The 107 // Removes the user's configuration from the network with |service_path|. The
108 // network may still show up in the visible networks after this, but no user 108 // network may still show up in the visible networks after this, but no user
109 // configuration will remain. If it was managed, it will still be configured. 109 // configuration will remain. If it was managed, it will still be configured.
110 // This method is expected to be called by a user initiated action (see 110 // This method is expected to be called by a user initiated action (see
111 // NetworkConfigurationObserver::Source). 111 // NetworkConfigurationObserver::Source).
112 virtual void RemoveConfiguration( 112 virtual void RemoveConfiguration(
113 const std::string& service_path, 113 const std::string& service_path,
114 const base::Closure& callback, 114 const base::Closure& callback,
115 const network_handler::ErrorCallback& error_callback) const = 0; 115 const network_handler::ErrorCallback& error_callback) const = 0;
116 116
117 // Removes the user's configuration from the network with |service_path| in
118 // the network's active network profile.
119 // Same applies as for |RemoveConfiguration|, with the difference that the
120 // configuration is only removed from a single network profile.
121 virtual void RemoveConfigurationFromCurrentProfile(
122 const std::string& service_path,
123 const base::Closure& callback,
124 const network_handler::ErrorCallback& error_callback) const = 0;
125
117 // Only to be called by NetworkConfigurationUpdater or from tests. Sets 126 // Only to be called by NetworkConfigurationUpdater or from tests. Sets
118 // |network_configs_onc| and |global_network_config| as the current policy of 127 // |network_configs_onc| and |global_network_config| as the current policy of
119 // |userhash| and |onc_source|. The policy will be applied (not necessarily 128 // |userhash| and |onc_source|. The policy will be applied (not necessarily
120 // immediately) to Shill's profiles and enforced in future configurations 129 // immediately) to Shill's profiles and enforced in future configurations
121 // until the policy associated with |userhash| and |onc_source| is changed 130 // until the policy associated with |userhash| and |onc_source| is changed
122 // again with this function. For device policies, |userhash| must be empty. 131 // again with this function. For device policies, |userhash| must be empty.
123 virtual void SetPolicy( 132 virtual void SetPolicy(
124 ::onc::ONCSource onc_source, 133 ::onc::ONCSource onc_source,
125 const std::string& userhash, 134 const std::string& userhash,
126 const base::ListValue& network_configs_onc, 135 const base::ListValue& network_configs_onc,
(...skipping 25 matching lines...) Expand all
152 const std::string& guid, 161 const std::string& guid,
153 const std::string& profile_path) const = 0; 162 const std::string& profile_path) const = 0;
154 163
155 private: 164 private:
156 DISALLOW_ASSIGN(ManagedNetworkConfigurationHandler); 165 DISALLOW_ASSIGN(ManagedNetworkConfigurationHandler);
157 }; 166 };
158 167
159 } // namespace chromeos 168 } // namespace chromeos
160 169
161 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_ 170 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/shill_profile_client.h ('k') | chromeos/network/managed_network_configuration_handler_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698