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

Side by Side Diff: extensions/browser/api/vpn_provider/vpn_service.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_ 5 #ifndef EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
6 #define EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_ 6 #define EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 const std::string& configuration_name); 163 const std::string& configuration_name);
164 164
165 private: 165 private:
166 class VpnConfiguration; 166 class VpnConfiguration;
167 167
168 using StringToConfigurationMap = std::map<std::string, VpnConfiguration*>; 168 using StringToConfigurationMap = std::map<std::string, VpnConfiguration*>;
169 169
170 // Callback used to indicate that configuration was successfully created. 170 // Callback used to indicate that configuration was successfully created.
171 void OnCreateConfigurationSuccess(const SuccessCallback& callback, 171 void OnCreateConfigurationSuccess(const SuccessCallback& callback,
172 VpnConfiguration* configuration, 172 VpnConfiguration* configuration,
173 const std::string& service_path); 173 const std::string& service_path,
174 const std::string& guid);
174 175
175 // Callback used to indicate that configuration creation failed. 176 // Callback used to indicate that configuration creation failed.
176 void OnCreateConfigurationFailure( 177 void OnCreateConfigurationFailure(
177 const FailureCallback& callback, 178 const FailureCallback& callback,
178 VpnConfiguration* configuration, 179 VpnConfiguration* configuration,
179 const std::string& error_name, 180 const std::string& error_name,
180 scoped_ptr<base::DictionaryValue> error_data); 181 scoped_ptr<base::DictionaryValue> error_data);
181 182
182 // Callback used to indicate that removing a configuration succeeded. 183 // Callback used to indicate that removing a configuration succeeded.
183 void OnRemoveConfigurationSuccess(const SuccessCallback& callback); 184 void OnRemoveConfigurationSuccess(const SuccessCallback& callback);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 StringToConfigurationMap service_path_to_configuration_map_; 244 StringToConfigurationMap service_path_to_configuration_map_;
244 245
245 base::WeakPtrFactory<VpnService> weak_factory_; 246 base::WeakPtrFactory<VpnService> weak_factory_;
246 247
247 DISALLOW_COPY_AND_ASSIGN(VpnService); 248 DISALLOW_COPY_AND_ASSIGN(VpnService);
248 }; 249 };
249 250
250 } // namespace chromeos 251 } // namespace chromeos
251 252
252 #endif // EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_ 253 #endif // EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698