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

Side by Side Diff: chromeos/network/network_state_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
« no previous file with comments | « chromeos/network/network_sms_handler.h ('k') | chromeos/settings/timezone_settings.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_STATE_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ 6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 std::string GetTechnologyForType(const NetworkTypePattern& type) const; 355 std::string GetTechnologyForType(const NetworkTypePattern& type) const;
356 356
357 // Returns all the technology types for |type|. 357 // Returns all the technology types for |type|.
358 ScopedVector<std::string> GetTechnologiesForType( 358 ScopedVector<std::string> GetTechnologiesForType(
359 const NetworkTypePattern& type) const; 359 const NetworkTypePattern& type) const;
360 360
361 // Shill property handler instance, owned by this class. 361 // Shill property handler instance, owned by this class.
362 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_; 362 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
363 363
364 // Observer list 364 // Observer list
365 ObserverList<NetworkStateHandlerObserver> observers_; 365 base::ObserverList<NetworkStateHandlerObserver> observers_;
366 366
367 // List of managed network states 367 // List of managed network states
368 ManagedStateList network_list_; 368 ManagedStateList network_list_;
369 369
370 // Set to true when the network list is sorted, cleared when network updates 370 // Set to true when the network list is sorted, cleared when network updates
371 // arrive. Used to trigger sorting when needed. 371 // arrive. Used to trigger sorting when needed.
372 bool network_list_sorted_; 372 bool network_list_sorted_;
373 373
374 // List of managed device states 374 // List of managed device states
375 ManagedStateList device_list_; 375 ManagedStateList device_list_;
376 376
377 // Keeps track of the default network for notifying observers when it changes. 377 // Keeps track of the default network for notifying observers when it changes.
378 std::string default_network_path_; 378 std::string default_network_path_;
379 379
380 // List of interfaces on which portal check is enabled. 380 // List of interfaces on which portal check is enabled.
381 std::string check_portal_list_; 381 std::string check_portal_list_;
382 382
383 // Map of network specifiers to guids. Contains an entry for each 383 // Map of network specifiers to guids. Contains an entry for each
384 // NetworkState that is not saved in a profile. 384 // NetworkState that is not saved in a profile.
385 SpecifierGuidMap specifier_guid_map_; 385 SpecifierGuidMap specifier_guid_map_;
386 386
387 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler); 387 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
388 }; 388 };
389 389
390 } // namespace chromeos 390 } // namespace chromeos
391 391
392 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ 392 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_sms_handler.h ('k') | chromeos/settings/timezone_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698