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

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

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 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
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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // Calls Shill.Manager.Disconnect asynchronously. 215 // Calls Shill.Manager.Disconnect asynchronously.
216 void CallShillDisconnect( 216 void CallShillDisconnect(
217 const std::string& service_path, 217 const std::string& service_path,
218 const base::Closure& success_callback, 218 const base::Closure& success_callback,
219 const network_handler::ErrorCallback& error_callback); 219 const network_handler::ErrorCallback& error_callback);
220 220
221 // Handle success from Shill.Service.Disconnect. 221 // Handle success from Shill.Service.Disconnect.
222 void HandleShillDisconnectSuccess(const std::string& service_path, 222 void HandleShillDisconnectSuccess(const std::string& service_path,
223 const base::Closure& success_callback); 223 const base::Closure& success_callback);
224 224
225 ObserverList<NetworkConnectionObserver> observers_; 225 base::ObserverList<NetworkConnectionObserver> observers_;
226 226
227 // Local references to the associated handler instances. 227 // Local references to the associated handler instances.
228 CertLoader* cert_loader_; 228 CertLoader* cert_loader_;
229 NetworkStateHandler* network_state_handler_; 229 NetworkStateHandler* network_state_handler_;
230 NetworkConfigurationHandler* configuration_handler_; 230 NetworkConfigurationHandler* configuration_handler_;
231 ManagedNetworkConfigurationHandler* managed_configuration_handler_; 231 ManagedNetworkConfigurationHandler* managed_configuration_handler_;
232 232
233 // Map of pending connect requests, used to prevent repeated attempts while 233 // Map of pending connect requests, used to prevent repeated attempts while
234 // waiting for Shill and to trigger callbacks on eventual success or failure. 234 // waiting for Shill and to trigger callbacks on eventual success or failure.
235 std::map<std::string, ConnectRequest> pending_requests_; 235 std::map<std::string, ConnectRequest> pending_requests_;
236 scoped_ptr<ConnectRequest> queued_connect_; 236 scoped_ptr<ConnectRequest> queued_connect_;
237 237
238 // Track certificate loading state. 238 // Track certificate loading state.
239 bool logged_in_; 239 bool logged_in_;
240 bool certificates_loaded_; 240 bool certificates_loaded_;
241 base::TimeTicks logged_in_time_; 241 base::TimeTicks logged_in_time_;
242 242
243 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 243 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
244 }; 244 };
245 245
246 } // namespace chromeos 246 } // namespace chromeos
247 247
248 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 248 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_configuration_handler.h ('k') | chromeos/network/network_profile_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698