| 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_;
|
|
|
|
|