summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/session_manager_client.cc
diff options
context:
space:
mode:
authorgdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 05:34:16 +0000
committergdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 05:34:16 +0000
commit926957b72bee0ee2b268d946bc0ae25047e92539 (patch)
tree9ad6c5dec928ebdaf64299aeebecf0505c32df30 /chromeos/dbus/session_manager_client.cc
parente94bbcbf1ed35d9636c59962acf7aa00d86fa181 (diff)
downloadchromium_src-926957b72bee0ee2b268d946bc0ae25047e92539.zip
chromium_src-926957b72bee0ee2b268d946bc0ae25047e92539.tar.gz
chromium_src-926957b72bee0ee2b268d946bc0ae25047e92539.tar.bz2
Cleaning up weak_ptr_factory destruction order.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10917115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/session_manager_client.cc')
-rw-r--r--chromeos/dbus/session_manager_client.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 890a604..ef47500 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -323,6 +323,9 @@ class SessionManagerClientImpl : public SessionManagerClient {
dbus::ObjectProxy* session_manager_proxy_;
ObserverList<Observer> observers_;
bool screen_locked_;
+
+ // Note: This should remain the last member so it'll be destroyed and
+ // invalidate its weak pointers before any other members are destroyed.
base::WeakPtrFactory<SessionManagerClientImpl> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(SessionManagerClientImpl);