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

Side by Side 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, 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_IMPL_H_ 5 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void GetManagedProperties( 49 void GetManagedProperties(
50 const std::string& userhash, 50 const std::string& userhash,
51 const std::string& service_path, 51 const std::string& service_path,
52 const network_handler::DictionaryResultCallback& callback, 52 const network_handler::DictionaryResultCallback& callback,
53 const network_handler::ErrorCallback& error_callback) override; 53 const network_handler::ErrorCallback& error_callback) override;
54 54
55 void SetProperties( 55 void SetProperties(
56 const std::string& service_path, 56 const std::string& service_path,
57 const base::DictionaryValue& user_settings, 57 const base::DictionaryValue& user_settings,
58 const base::Closure& callback, 58 const base::Closure& callback,
59 const network_handler::ErrorCallback& error_callback) const override; 59 const network_handler::ErrorCallback& error_callback) override;
60 60
61 void CreateConfiguration( 61 void CreateConfiguration(
62 const std::string& userhash, 62 const std::string& userhash,
63 const base::DictionaryValue& properties, 63 const base::DictionaryValue& properties,
64 const network_handler::StringResultCallback& callback, 64 const network_handler::StringResultCallback& callback,
65 const network_handler::ErrorCallback& error_callback) const override; 65 const network_handler::ErrorCallback& error_callback) const override;
66 66
67 void RemoveConfiguration( 67 void RemoveConfiguration(
68 const std::string& service_path, 68 const std::string& service_path,
69 const base::Closure& callback, 69 const base::Closure& callback,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 GetDevicePropertiesCallback send_callback, 172 GetDevicePropertiesCallback send_callback,
173 const std::string& device_path, 173 const std::string& device_path,
174 const base::DictionaryValue& device_properties); 174 const base::DictionaryValue& device_properties);
175 void GetDevicePropertiesFailure( 175 void GetDevicePropertiesFailure(
176 const std::string& service_path, 176 const std::string& service_path,
177 scoped_ptr<base::DictionaryValue> network_properties, 177 scoped_ptr<base::DictionaryValue> network_properties,
178 GetDevicePropertiesCallback send_callback, 178 GetDevicePropertiesCallback send_callback,
179 const std::string& error_name, 179 const std::string& error_name,
180 scoped_ptr<base::DictionaryValue> error_data); 180 scoped_ptr<base::DictionaryValue> error_data);
181 181
182 // Called from SetProperties, calls NCH::SetShillProperties.
183 void SetShillProperties(const std::string& service_path,
184 scoped_ptr<base::DictionaryValue> shill_dictionary,
185 const base::Closure& callback,
186 const network_handler::ErrorCallback& error_callback);
187
182 // Applies policies for |userhash|. |modified_policies| must be not null and 188 // Applies policies for |userhash|. |modified_policies| must be not null and
183 // contain the GUIDs of the network configurations that changed since the last 189 // contain the GUIDs of the network configurations that changed since the last
184 // policy application. Returns true if policy application was started and 190 // policy application. Returns true if policy application was started and
185 // false if it was queued or delayed. 191 // false if it was queued or delayed.
186 bool ApplyOrQueuePolicies(const std::string& userhash, 192 bool ApplyOrQueuePolicies(const std::string& userhash,
187 std::set<std::string>* modified_policies); 193 std::set<std::string>* modified_policies);
188 194
189 // If present, the empty string maps to the device policy. 195 // If present, the empty string maps to the device policy.
190 UserToPoliciesMap policies_by_user_; 196 UserToPoliciesMap policies_by_user_;
191 197
(...skipping 18 matching lines...) Expand all
210 // For Shill client callbacks 216 // For Shill client callbacks
211 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl> 217 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl>
212 weak_ptr_factory_; 218 weak_ptr_factory_;
213 219
214 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl); 220 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl);
215 }; 221 };
216 222
217 } // namespace chromeos 223 } // namespace chromeos
218 224
219 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 225 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698