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

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

Issue 22588002: Refactor the client certificate code in chromeos/network/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/network/client_cert_util.cc ('k') | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 scoped_ptr<base::DictionaryValue> error_data); 157 scoped_ptr<base::DictionaryValue> error_data);
158 158
159 // Handle success or failure from Shill.Service.Connect. 159 // Handle success or failure from Shill.Service.Connect.
160 void HandleShillConnectSuccess(const std::string& service_path); 160 void HandleShillConnectSuccess(const std::string& service_path);
161 void HandleShillConnectFailure(const std::string& service_path, 161 void HandleShillConnectFailure(const std::string& service_path,
162 const std::string& error_name, 162 const std::string& error_name,
163 const std::string& error_message); 163 const std::string& error_message);
164 164
165 void CheckPendingRequest(const std::string service_path); 165 void CheckPendingRequest(const std::string service_path);
166 void CheckAllPendingRequests(); 166 void CheckAllPendingRequests();
167 bool CertificateIsConfigured(NetworkUIData* ui_data, std::string* pkcs11_id); 167
168 // Returns the PKCS#11 ID of a cert matching the certificate pattern in
169 // |ui_data|. Returns empty string otherwise.
170 std::string CertificateIsConfigured(NetworkUIData* ui_data);
168 void ErrorCallbackForPendingRequest(const std::string& service_path, 171 void ErrorCallbackForPendingRequest(const std::string& service_path,
169 const std::string& error_name); 172 const std::string& error_name);
170 173
171 // Calls Shill.Manager.Disconnect asynchronously. 174 // Calls Shill.Manager.Disconnect asynchronously.
172 void CallShillDisconnect( 175 void CallShillDisconnect(
173 const std::string& service_path, 176 const std::string& service_path,
174 const base::Closure& success_callback, 177 const base::Closure& success_callback,
175 const network_handler::ErrorCallback& error_callback); 178 const network_handler::ErrorCallback& error_callback);
176 179
177 // Handle success from Shill.Service.Disconnect. 180 // Handle success from Shill.Service.Disconnect.
(...skipping 24 matching lines...) Expand all
202 // Track certificate loading state. 205 // Track certificate loading state.
203 bool logged_in_; 206 bool logged_in_;
204 bool certificates_loaded_; 207 bool certificates_loaded_;
205 208
206 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 209 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
207 }; 210 };
208 211
209 } // namespace chromeos 212 } // namespace chromeos
210 213
211 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 214 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/client_cert_util.cc ('k') | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698