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

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

Issue 1562593002: Fix potential crashes in NetworkHandler code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test
Patch Set: Created 4 years, 11 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_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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 std::string GetTechnologyForType(const NetworkTypePattern& type) const; 367 std::string GetTechnologyForType(const NetworkTypePattern& type) const;
368 368
369 // Returns all the technology types for |type|. 369 // Returns all the technology types for |type|.
370 ScopedVector<std::string> GetTechnologiesForType( 370 ScopedVector<std::string> GetTechnologiesForType(
371 const NetworkTypePattern& type) const; 371 const NetworkTypePattern& type) const;
372 372
373 // Shill property handler instance, owned by this class. 373 // Shill property handler instance, owned by this class.
374 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_; 374 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
375 375
376 // Observer list 376 // Observer list
377 base::ObserverList<NetworkStateHandlerObserver> observers_; 377 base::ObserverList<NetworkStateHandlerObserver, true> observers_;
378 378
379 // List of managed network states 379 // List of managed network states
380 ManagedStateList network_list_; 380 ManagedStateList network_list_;
381 381
382 // Set to true when the network list is sorted, cleared when network updates 382 // Set to true when the network list is sorted, cleared when network updates
383 // arrive. Used to trigger sorting when needed. 383 // arrive. Used to trigger sorting when needed.
384 bool network_list_sorted_; 384 bool network_list_sorted_;
385 385
386 // List of managed device states 386 // List of managed device states
387 ManagedStateList device_list_; 387 ManagedStateList device_list_;
388 388
389 // Keeps track of the default network for notifying observers when it changes. 389 // Keeps track of the default network for notifying observers when it changes.
390 std::string default_network_path_; 390 std::string default_network_path_;
391 391
392 // List of interfaces on which portal check is enabled. 392 // List of interfaces on which portal check is enabled.
393 std::string check_portal_list_; 393 std::string check_portal_list_;
394 394
395 // Map of network specifiers to guids. Contains an entry for each 395 // Map of network specifiers to guids. Contains an entry for each
396 // NetworkState that is not saved in a profile. 396 // NetworkState that is not saved in a profile.
397 SpecifierGuidMap specifier_guid_map_; 397 SpecifierGuidMap specifier_guid_map_;
398 398
399 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler); 399 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
400 }; 400 };
401 401
402 } // namespace chromeos 402 } // namespace chromeos
403 403
404 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ 404 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698