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

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

Issue 1779633002: Invoke createNetwork() callback with GUID, not service name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more trybot failures Created 4 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 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 void SetProperties( 56 void SetProperties(
57 const std::string& service_path, 57 const std::string& service_path,
58 const base::DictionaryValue& user_settings, 58 const base::DictionaryValue& user_settings,
59 const base::Closure& callback, 59 const base::Closure& callback,
60 const network_handler::ErrorCallback& error_callback) override; 60 const network_handler::ErrorCallback& error_callback) override;
61 61
62 void CreateConfiguration( 62 void CreateConfiguration(
63 const std::string& userhash, 63 const std::string& userhash,
64 const base::DictionaryValue& properties, 64 const base::DictionaryValue& properties,
65 const network_handler::StringResultCallback& callback, 65 const network_handler::ServiceResultCallback& callback,
66 const network_handler::ErrorCallback& error_callback) const override; 66 const network_handler::ErrorCallback& error_callback) const override;
67 67
68 void RemoveConfiguration( 68 void RemoveConfiguration(
69 const std::string& service_path, 69 const std::string& service_path,
70 const base::Closure& callback, 70 const base::Closure& callback,
71 const network_handler::ErrorCallback& error_callback) const override; 71 const network_handler::ErrorCallback& error_callback) const override;
72 72
73 void SetPolicy(onc::ONCSource onc_source, 73 void SetPolicy(onc::ONCSource onc_source,
74 const std::string& userhash, 74 const std::string& userhash,
75 const base::ListValue& network_configs_onc, 75 const base::ListValue& network_configs_onc,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // Sends the response to the caller of GetProperties. 145 // Sends the response to the caller of GetProperties.
146 void SendProperties(const std::string& userhash, 146 void SendProperties(const std::string& userhash,
147 const network_handler::DictionaryResultCallback& callback, 147 const network_handler::DictionaryResultCallback& callback,
148 const network_handler::ErrorCallback& error_callback, 148 const network_handler::ErrorCallback& error_callback,
149 const std::string& service_path, 149 const std::string& service_path,
150 scoped_ptr<base::DictionaryValue> shill_properties); 150 scoped_ptr<base::DictionaryValue> shill_properties);
151 151
152 const Policies* GetPoliciesForUser(const std::string& userhash) const; 152 const Policies* GetPoliciesForUser(const std::string& userhash) const;
153 const Policies* GetPoliciesForProfile(const NetworkProfile& profile) const; 153 const Policies* GetPoliciesForProfile(const NetworkProfile& profile) const;
154 154
155 void OnPolicyAppliedToNetwork(const std::string& service_path); 155 void OnPolicyAppliedToNetwork(const std::string& service_path,
156 const std::string& guid);
156 157
157 // Helper method to append associated Device properties to |properties|. 158 // Helper method to append associated Device properties to |properties|.
158 void GetDeviceStateProperties(const std::string& service_path, 159 void GetDeviceStateProperties(const std::string& service_path,
159 base::DictionaryValue* properties); 160 base::DictionaryValue* properties);
160 161
161 // Callback for NetworkConfigurationHandler::GetProperties requests from 162 // Callback for NetworkConfigurationHandler::GetProperties requests from
162 // Get{Managed}Properties. This callback fills in properties from 163 // Get{Managed}Properties. This callback fills in properties from
163 // DeviceState and may request additional Device properties. 164 // DeviceState and may request additional Device properties.
164 // Note: Requesting Device properties requires an additional fetch and 165 // Note: Requesting Device properties requires an additional fetch and
165 // additional copying of data, so we only do it for Cellular networks which 166 // additional copying of data, so we only do it for Cellular networks which
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // For Shill client callbacks 221 // For Shill client callbacks
221 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl> 222 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl>
222 weak_ptr_factory_; 223 weak_ptr_factory_;
223 224
224 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl); 225 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl);
225 }; 226 };
226 227
227 } // namespace chromeos 228 } // namespace chromeos
228 229
229 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 230 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698