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

Side by Side Diff: chromeos/dbus/shill_client_helper.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/session_manager_client.cc ('k') | chromeos/dbus/system_clock_client.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_DBUS_SHILL_CLIENT_HELPER_H_ 5 #ifndef CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
6 #define CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_ 6 #define CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const std::string& signal, 168 const std::string& signal,
169 bool success); 169 bool success);
170 170
171 // Handles PropertyChanged signal. 171 // Handles PropertyChanged signal.
172 void OnPropertyChanged(dbus::Signal* signal); 172 void OnPropertyChanged(dbus::Signal* signal);
173 173
174 dbus::ObjectProxy* proxy_; 174 dbus::ObjectProxy* proxy_;
175 ReleasedCallback released_callback_; 175 ReleasedCallback released_callback_;
176 int active_refs_; 176 int active_refs_;
177 PropertyChangedHandler property_changed_handler_; 177 PropertyChangedHandler property_changed_handler_;
178 ObserverList<ShillPropertyChangedObserver, true /* check_empty */> 178 base::ObserverList<ShillPropertyChangedObserver, true /* check_empty */>
179 observer_list_; 179 observer_list_;
180 std::vector<std::string> interfaces_to_be_monitored_; 180 std::vector<std::string> interfaces_to_be_monitored_;
181 181
182 // Note: This should remain the last member so it'll be destroyed and 182 // Note: This should remain the last member so it'll be destroyed and
183 // invalidate its weak pointers before any other members are destroyed. 183 // invalidate its weak pointers before any other members are destroyed.
184 base::WeakPtrFactory<ShillClientHelper> weak_ptr_factory_; 184 base::WeakPtrFactory<ShillClientHelper> weak_ptr_factory_;
185 185
186 DISALLOW_COPY_AND_ASSIGN(ShillClientHelper); 186 DISALLOW_COPY_AND_ASSIGN(ShillClientHelper);
187 }; 187 };
188 188
189 } // namespace chromeos 189 } // namespace chromeos
190 190
191 #endif // CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_ 191 #endif // CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/session_manager_client.cc ('k') | chromeos/dbus/system_clock_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698