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

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

Issue 17167010: Fix minor bugs found in NetworkConnectionHandler code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 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 | « no previous file | 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 const base::Closure& success_callback); 162 const base::Closure& success_callback);
163 void HandleShillDisconnectFailure( 163 void HandleShillDisconnectFailure(
164 const std::string& service_path, 164 const std::string& service_path,
165 const network_handler::ErrorCallback& error_callback, 165 const network_handler::ErrorCallback& error_callback,
166 const std::string& error_name, 166 const std::string& error_name,
167 const std::string& error_message); 167 const std::string& error_message);
168 168
169 // Local references to the associated handler instances. 169 // Local references to the associated handler instances.
170 CertLoader* cert_loader_; 170 CertLoader* cert_loader_;
171 NetworkStateHandler* network_state_handler_; 171 NetworkStateHandler* network_state_handler_;
172 NetworkProfileHandler* network_profile_handler_;
173 NetworkConfigurationHandler* network_configuration_handler_; 172 NetworkConfigurationHandler* network_configuration_handler_;
174 173
175 // Map of pending connect requests, used to prevent repeated attempts while 174 // Map of pending connect requests, used to prevent repeated attempts while
176 // waiting for Shill and to trigger callbacks on eventual success or failure. 175 // waiting for Shill and to trigger callbacks on eventual success or failure.
177 std::map<std::string, ConnectRequest> pending_requests_; 176 std::map<std::string, ConnectRequest> pending_requests_;
178 scoped_ptr<ConnectRequest> queued_connect_; 177 scoped_ptr<ConnectRequest> queued_connect_;
179 178
180 // Track certificate loading state. 179 // Track certificate loading state.
181 bool logged_in_; 180 bool logged_in_;
182 bool certificates_loaded_; 181 bool certificates_loaded_;
183 182
184 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 183 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
185 }; 184 };
186 185
187 } // namespace chromeos 186 } // namespace chromeos
188 187
189 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 188 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698