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

Side by Side Diff: content/browser/utility_process_host_impl.h

Issue 2230283003: Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@renderer-channel
Patch Set: Created 4 years, 4 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
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_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
6 #define CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "content/public/browser/browser_child_process_host_delegate.h" 18 #include "content/public/browser/browser_child_process_host_delegate.h"
19 #include "content/public/browser/utility_process_host.h" 19 #include "content/public/browser/utility_process_host.h"
20 20
21 namespace base { 21 namespace base {
22 class SequencedTaskRunner; 22 class SequencedTaskRunner;
23 class Thread; 23 class Thread;
24 } 24 }
25 25
26 namespace content { 26 namespace content {
27 class BrowserChildProcessHostImpl; 27 class BrowserChildProcessHostImpl;
28 class InProcessChildThreadParams; 28 class InProcessChildThreadParams;
29 class MojoChildConnection;
29 30
30 typedef base::Thread* (*UtilityMainThreadFactoryFunction)( 31 typedef base::Thread* (*UtilityMainThreadFactoryFunction)(
31 const InProcessChildThreadParams&); 32 const InProcessChildThreadParams&);
32 33
33 class CONTENT_EXPORT UtilityProcessHostImpl 34 class CONTENT_EXPORT UtilityProcessHostImpl
34 : public NON_EXPORTED_BASE(UtilityProcessHost), 35 : public NON_EXPORTED_BASE(UtilityProcessHost),
35 public BrowserChildProcessHostDelegate { 36 public BrowserChildProcessHostDelegate {
36 public: 37 public:
37 static void RegisterUtilityMainThreadFactory( 38 static void RegisterUtilityMainThreadFactory(
38 UtilityMainThreadFactoryFunction create); 39 UtilityMainThreadFactoryFunction create);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 110
110 // A user-visible name identifying this process. Used to indentify this 111 // A user-visible name identifying this process. Used to indentify this
111 // process in the task manager. 112 // process in the task manager.
112 base::string16 name_; 113 base::string16 name_;
113 114
114 std::unique_ptr<BrowserChildProcessHostImpl> process_; 115 std::unique_ptr<BrowserChildProcessHostImpl> process_;
115 116
116 // Used in single-process mode instead of process_. 117 // Used in single-process mode instead of process_.
117 std::unique_ptr<base::Thread> in_process_thread_; 118 std::unique_ptr<base::Thread> in_process_thread_;
118 119
120 // Browser-side Mojo endpoint which sets up a Mojo channel with the child
121 // process and contains the browser's shell::InterfaceRegistry.
122 const std::string child_token_;
123 std::unique_ptr<MojoChildConnection> mojo_child_connection_;
124
119 // Used to vend weak pointers, and should always be declared last. 125 // Used to vend weak pointers, and should always be declared last.
120 base::WeakPtrFactory<UtilityProcessHostImpl> weak_ptr_factory_; 126 base::WeakPtrFactory<UtilityProcessHostImpl> weak_ptr_factory_;
121 127
122 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl); 128 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
123 }; 129 };
124 130
125 } // namespace content 131 } // namespace content
126 132
127 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 133 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/ppapi_plugin_process_host.cc ('k') | content/browser/utility_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698