| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_PROFILE_HANDLER_H_ | 5 #ifndef CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_ |
| 6 #define CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_ | 6 #define CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_ |
| 7 | 7 |
| 8 #include <set> |
| 8 #include <string> | 9 #include <string> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 12 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 14 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 15 #include "chromeos/chromeos_export.h" | 16 #include "chromeos/chromeos_export.h" |
| 16 #include "chromeos/dbus/dbus_method_call_status.h" | 17 #include "chromeos/dbus/dbus_method_call_status.h" |
| 17 #include "chromeos/dbus/shill_property_changed_observer.h" | 18 #include "chromeos/dbus/shill_property_changed_observer.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 NetworkProfileHandler(); | 67 NetworkProfileHandler(); |
| 67 | 68 |
| 68 // Add ShillManagerClient property observer and request initial list. | 69 // Add ShillManagerClient property observer and request initial list. |
| 69 void Init(); | 70 void Init(); |
| 70 | 71 |
| 71 void AddProfile(const NetworkProfile& profile); | 72 void AddProfile(const NetworkProfile& profile); |
| 72 void RemoveProfile(const std::string& profile_path); | 73 void RemoveProfile(const std::string& profile_path); |
| 73 | 74 |
| 74 private: | 75 private: |
| 75 ProfileList profiles_; | 76 ProfileList profiles_; |
| 77 |
| 78 // Contains the profile paths for which properties were requested. Once the |
| 79 // properties are retrieved and the path is still in this set, a new profile |
| 80 // object is created. |
| 81 std::set<std::string> pending_profile_creations_; |
| 76 ObserverList<NetworkProfileObserver> observers_; | 82 ObserverList<NetworkProfileObserver> observers_; |
| 77 | 83 |
| 78 // For Shill client callbacks | 84 // For Shill client callbacks |
| 79 base::WeakPtrFactory<NetworkProfileHandler> weak_ptr_factory_; | 85 base::WeakPtrFactory<NetworkProfileHandler> weak_ptr_factory_; |
| 80 | 86 |
| 81 private: | 87 private: |
| 82 DISALLOW_COPY_AND_ASSIGN(NetworkProfileHandler); | 88 DISALLOW_COPY_AND_ASSIGN(NetworkProfileHandler); |
| 83 }; | 89 }; |
| 84 | 90 |
| 85 } // namespace chromeos | 91 } // namespace chromeos |
| 86 | 92 |
| 87 #endif // CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_ | 93 #endif // CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_ |
| OLD | NEW |