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

Side by Side Diff: content/child/child_thread_impl.h

Issue 1704743002: Revert of Clean up public interface of AttachmentBrokerUnprivileged. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « components/nacl/loader/nacl_listener.cc ('k') | content/child/child_thread_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 5 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "content/common/mojo/channel_init.h" 24 #include "content/common/mojo/channel_init.h"
25 #include "content/public/child/child_thread.h" 25 #include "content/public/child/child_thread.h"
26 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. 26 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
27 #include "ipc/ipc_platform_file.h" 27 #include "ipc/ipc_platform_file.h"
28 28
29 namespace base { 29 namespace base {
30 class MessageLoop; 30 class MessageLoop;
31 } // namespace base 31 } // namespace base
32 32
33 namespace IPC { 33 namespace IPC {
34 class AttachmentBrokerUnprivileged;
34 class MessageFilter; 35 class MessageFilter;
35 class ScopedIPCSupport; 36 class ScopedIPCSupport;
36 class SyncChannel; 37 class SyncChannel;
37 class SyncMessageFilter; 38 class SyncMessageFilter;
38 } // namespace IPC 39 } // namespace IPC
39 40
40 namespace blink { 41 namespace blink {
41 class WebFrame; 42 class WebFrame;
42 } // namespace blink 43 } // namespace blink
43 44
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 #ifdef IPC_MESSAGE_LOG_ENABLED 233 #ifdef IPC_MESSAGE_LOG_ENABLED
233 void OnSetIPCLoggingEnabled(bool enable); 234 void OnSetIPCLoggingEnabled(bool enable);
234 #endif 235 #endif
235 236
236 void EnsureConnected(); 237 void EnsureConnected();
237 238
238 scoped_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_; 239 scoped_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_;
239 scoped_ptr<MojoApplication> mojo_application_; 240 scoped_ptr<MojoApplication> mojo_application_;
240 241
241 std::string channel_name_; 242 std::string channel_name_;
243 scoped_ptr<IPC::AttachmentBrokerUnprivileged> attachment_broker_;
242 scoped_ptr<IPC::SyncChannel> channel_; 244 scoped_ptr<IPC::SyncChannel> channel_;
243 245
244 // Allows threads other than the main thread to send sync messages. 246 // Allows threads other than the main thread to send sync messages.
245 scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_; 247 scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
246 248
247 scoped_refptr<ThreadSafeSender> thread_safe_sender_; 249 scoped_refptr<ThreadSafeSender> thread_safe_sender_;
248 250
249 // Implements message routing functionality to the consumers of 251 // Implements message routing functionality to the consumers of
250 // ChildThreadImpl. 252 // ChildThreadImpl.
251 ChildThreadMessageRouter router_; 253 ChildThreadMessageRouter router_;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 326
325 private: 327 private:
326 struct Options options_; 328 struct Options options_;
327 329
328 DISALLOW_COPY_AND_ASSIGN(Builder); 330 DISALLOW_COPY_AND_ASSIGN(Builder);
329 }; 331 };
330 332
331 } // namespace content 333 } // namespace content
332 334
333 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 335 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698