diff options
| author | anujk.sharma <anujk.sharma@samsung.com> | 2014-08-27 23:49:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 06:50:11 +0000 |
| commit | 0184ced8d904d202ad7ab392ef8eca55d83d2937 (patch) | |
| tree | 215ff2bda703e71a35d960a74e05f1213444cabe /ipc/mojo/ipc_channel_mojo.h | |
| parent | 884ad197db2dd93253957c089cd583b8fca4802d (diff) | |
| download | chromium_src-0184ced8d904d202ad7ab392ef8eca55d83d2937.zip chromium_src-0184ced8d904d202ad7ab392ef8eca55d83d2937.tar.gz chromium_src-0184ced8d904d202ad7ab392ef8eca55d83d2937.tar.bz2 | |
Declaring the weak_ptr_factory in proper order.
Cleaning up weak_ptr_factory destruction order in "src/ipc" module.
WeakPtrFactory should remain the last member so it'll be destroyed and
invalidate its weak pointers before any other members are destroyed.
BUG=303818
Review URL: https://codereview.chromium.org/508903002
Cr-Commit-Position: refs/heads/master@{#292334}
Diffstat (limited to 'ipc/mojo/ipc_channel_mojo.h')
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index a2fa587..4d4df63 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -108,7 +108,6 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel { void InitOnIOThread(); - base::WeakPtrFactory<ChannelMojo> weak_factory_; scoped_ptr<Channel> bootstrap_; Mode mode_; Listener* listener_; @@ -120,6 +119,8 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel { scoped_ptr<MessageReader, ReaderDeleter> message_reader_; ScopedVector<Message> pending_messages_; + base::WeakPtrFactory<ChannelMojo> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(ChannelMojo); }; |