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

Side by Side Diff: ipc/mojo/ipc_channel_mojo.h

Issue 508903002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 3 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 | « ipc/ipc_channel_win.h ('k') | ipc/mojo/ipc_channel_mojo.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 IPC_IPC_CHANNEL_MOJO_H_ 5 #ifndef IPC_IPC_CHANNEL_MOJO_H_
6 #define IPC_IPC_CHANNEL_MOJO_H_ 6 #define IPC_IPC_CHANNEL_MOJO_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 class ControlReader; 101 class ControlReader;
102 class ServerControlReader; 102 class ServerControlReader;
103 class ClientControlReader; 103 class ClientControlReader;
104 class MessageReader; 104 class MessageReader;
105 105
106 ChannelMojo(scoped_ptr<Channel> bootstrap, Mode mode, Listener* listener, 106 ChannelMojo(scoped_ptr<Channel> bootstrap, Mode mode, Listener* listener,
107 scoped_refptr<base::TaskRunner> io_thread_task_runner); 107 scoped_refptr<base::TaskRunner> io_thread_task_runner);
108 108
109 void InitOnIOThread(); 109 void InitOnIOThread();
110 110
111 base::WeakPtrFactory<ChannelMojo> weak_factory_;
112 scoped_ptr<Channel> bootstrap_; 111 scoped_ptr<Channel> bootstrap_;
113 Mode mode_; 112 Mode mode_;
114 Listener* listener_; 113 Listener* listener_;
115 base::ProcessId peer_pid_; 114 base::ProcessId peer_pid_;
116 scoped_ptr<mojo::embedder::ChannelInfo, 115 scoped_ptr<mojo::embedder::ChannelInfo,
117 ChannelInfoDeleter> channel_info_; 116 ChannelInfoDeleter> channel_info_;
118 117
119 scoped_ptr<ControlReader, ReaderDeleter> control_reader_; 118 scoped_ptr<ControlReader, ReaderDeleter> control_reader_;
120 scoped_ptr<MessageReader, ReaderDeleter> message_reader_; 119 scoped_ptr<MessageReader, ReaderDeleter> message_reader_;
121 ScopedVector<Message> pending_messages_; 120 ScopedVector<Message> pending_messages_;
122 121
122 base::WeakPtrFactory<ChannelMojo> weak_factory_;
123
123 DISALLOW_COPY_AND_ASSIGN(ChannelMojo); 124 DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
124 }; 125 };
125 126
126 } // namespace IPC 127 } // namespace IPC
127 128
128 #endif // IPC_IPC_CHANNEL_MOJO_H_ 129 #endif // IPC_IPC_CHANNEL_MOJO_H_
OLDNEW
« no previous file with comments | « ipc/ipc_channel_win.h ('k') | ipc/mojo/ipc_channel_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698