| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_NETWORK_CONNECTION_HANDLER_H_ | 5 #ifndef CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ |
| 6 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ | 6 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 // Handle success or failure from Shill.Service.Connect. | 166 // Handle success or failure from Shill.Service.Connect. |
| 167 void HandleShillConnectSuccess(const std::string& service_path); | 167 void HandleShillConnectSuccess(const std::string& service_path); |
| 168 void HandleShillConnectFailure(const std::string& service_path, | 168 void HandleShillConnectFailure(const std::string& service_path, |
| 169 const std::string& error_name, | 169 const std::string& error_name, |
| 170 const std::string& error_message); | 170 const std::string& error_message); |
| 171 | 171 |
| 172 void CheckPendingRequest(const std::string service_path); | 172 void CheckPendingRequest(const std::string service_path); |
| 173 void CheckAllPendingRequests(); | 173 void CheckAllPendingRequests(); |
| 174 | 174 |
| 175 // Returns the PKCS#11 ID of a cert matching the certificate pattern in | 175 // Returns the PKCS#11 ID of a cert matching the certificate pattern in |
| 176 // |ui_data|. Returns empty string otherwise. | 176 // |ui_data|. Returns empty string otherwise. Only certificates in |cert_list| |
| 177 std::string CertificateIsConfigured(NetworkUIData* ui_data); | 177 // are taken into account. |
| 178 std::string CertificateIsConfigured(NetworkUIData* ui_data, |
| 179 const net::CertificateList& cert_list); |
| 178 void ErrorCallbackForPendingRequest(const std::string& service_path, | 180 void ErrorCallbackForPendingRequest(const std::string& service_path, |
| 179 const std::string& error_name); | 181 const std::string& error_name); |
| 180 | 182 |
| 181 // Calls Shill.Manager.Disconnect asynchronously. | 183 // Calls Shill.Manager.Disconnect asynchronously. |
| 182 void CallShillDisconnect( | 184 void CallShillDisconnect( |
| 183 const std::string& service_path, | 185 const std::string& service_path, |
| 184 const base::Closure& success_callback, | 186 const base::Closure& success_callback, |
| 185 const network_handler::ErrorCallback& error_callback); | 187 const network_handler::ErrorCallback& error_callback); |
| 186 | 188 |
| 187 // Handle success from Shill.Service.Disconnect. | 189 // Handle success from Shill.Service.Disconnect. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 202 // Track certificate loading state. | 204 // Track certificate loading state. |
| 203 bool logged_in_; | 205 bool logged_in_; |
| 204 bool certificates_loaded_; | 206 bool certificates_loaded_; |
| 205 | 207 |
| 206 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); | 208 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); |
| 207 }; | 209 }; |
| 208 | 210 |
| 209 } // namespace chromeos | 211 } // namespace chromeos |
| 210 | 212 |
| 211 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ | 213 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ |
| OLD | NEW |