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

Unified Diff: chromeos/dbus/session_manager_client.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/privet_daemon_manager_client.cc ('k') | chromeos/dbus/shill_client_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/session_manager_client.cc
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 0854875d0aeb974c262b0a34963aaf48c4d79c3c..0e0d72ae2933e934e62495952bec4d81d83e8b94 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -633,7 +633,7 @@ class SessionManagerClientImpl : public SessionManagerClient {
dbus::ObjectProxy* session_manager_proxy_;
scoped_ptr<BlockingMethodCaller> blocking_method_caller_;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
// Most recent screen-lock state received from session_manager.
bool screen_is_locked_;
@@ -798,7 +798,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
private:
StubDelegate* delegate_; // Weak pointer; may be NULL.
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
std::string device_policy_;
bool screen_is_locked_;
« no previous file with comments | « chromeos/dbus/privet_daemon_manager_client.cc ('k') | chromeos/dbus/shill_client_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698