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

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

Issue 18119009: Make utility process run in-process when running in single-process mode. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: undo unnecessary changes Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/DEPS ('k') | content/browser/utility_process_host_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_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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "content/public/browser/browser_child_process_host_delegate.h" 16 #include "content/public/browser/browser_child_process_host_delegate.h"
17 #include "content/public/browser/utility_process_host.h" 17 #include "content/public/browser/utility_process_host.h"
18 18
19 namespace base { 19 namespace base {
20 class SequencedTaskRunner; 20 class SequencedTaskRunner;
21 } 21 }
22 22
23 namespace content { 23 namespace content {
24 class BrowserChildProcessHostImpl; 24 class BrowserChildProcessHostImpl;
25 class UtilityMainThread;
25 26
26 class CONTENT_EXPORT UtilityProcessHostImpl 27 class CONTENT_EXPORT UtilityProcessHostImpl
27 : public NON_EXPORTED_BASE(UtilityProcessHost), 28 : public NON_EXPORTED_BASE(UtilityProcessHost),
28 public BrowserChildProcessHostDelegate { 29 public BrowserChildProcessHostDelegate {
29 public: 30 public:
30 UtilityProcessHostImpl(UtilityProcessHostClient* client, 31 UtilityProcessHostImpl(UtilityProcessHostClient* client,
31 base::SequencedTaskRunner* client_task_runner); 32 base::SequencedTaskRunner* client_task_runner);
32 virtual ~UtilityProcessHostImpl(); 33 virtual ~UtilityProcessHostImpl();
33 34
34 // UtilityProcessHost implementation: 35 // UtilityProcessHost implementation:
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 72
72 // Launch the utility process from the zygote. Defaults to false. 73 // Launch the utility process from the zygote. Defaults to false.
73 bool use_linux_zygote_; 74 bool use_linux_zygote_;
74 75
75 base::EnvironmentVector env_; 76 base::EnvironmentVector env_;
76 77
77 bool started_; 78 bool started_;
78 79
79 scoped_ptr<BrowserChildProcessHostImpl> process_; 80 scoped_ptr<BrowserChildProcessHostImpl> process_;
80 81
82 // Used in single-process mode instead of process_.
83 scoped_ptr<UtilityMainThread> in_process_thread_;
84
81 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl); 85 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
82 }; 86 };
83 87
84 } // namespace content 88 } // namespace content
85 89
86 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 90 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/DEPS ('k') | content/browser/utility_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698