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

Side by Side Diff: chromeos/dbus/fake_shill_manager_client.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/dbus/fake_session_manager_client.h ('k') | chromeos/dbus/fake_update_engine_client.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
6 #define CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 6 #define CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // Technology type for fake cellular service. 145 // Technology type for fake cellular service.
146 std::string cellular_technology_; 146 std::string cellular_technology_;
147 147
148 // Roaming state for fake cellular service. 148 // Roaming state for fake cellular service.
149 std::string roaming_state_; 149 std::string roaming_state_;
150 150
151 typedef std::map<std::string, base::Value*> ShillPropertyMap; 151 typedef std::map<std::string, base::Value*> ShillPropertyMap;
152 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap; 152 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap;
153 DevicePropertyMap shill_device_property_map_; 153 DevicePropertyMap shill_device_property_map_;
154 154
155 ObserverList<ShillPropertyChangedObserver> observer_list_; 155 base::ObserverList<ShillPropertyChangedObserver> observer_list_;
156 156
157 // Track the default service for signaling Manager.DefaultService. 157 // Track the default service for signaling Manager.DefaultService.
158 std::string default_service_; 158 std::string default_service_;
159 159
160 // 'Best' service to connect to on ConnectToBestServices() calls. 160 // 'Best' service to connect to on ConnectToBestServices() calls.
161 std::string best_service_; 161 std::string best_service_;
162 162
163 // Note: This should remain the last member so it'll be destroyed and 163 // Note: This should remain the last member so it'll be destroyed and
164 // invalidate its weak pointers before any other members are destroyed. 164 // invalidate its weak pointers before any other members are destroyed.
165 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_; 165 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_;
166 166
167 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient); 167 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient);
168 }; 168 };
169 169
170 } // namespace chromeos 170 } // namespace chromeos
171 171
172 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 172 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/fake_session_manager_client.h ('k') | chromeos/dbus/fake_update_engine_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698