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

Side by Side Diff: content/browser/renderer_host/render_sandbox_host_linux.h

Issue 261783008: Revert of Make SandboxIPCProcess a thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
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_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/threading/simple_thread.h"
13 #include "content/browser/renderer_host/sandbox_ipc_linux.h"
14 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
15 12
16 template <typename T> struct DefaultSingletonTraits; 13 template <typename T> struct DefaultSingletonTraits;
17 14
18 namespace content { 15 namespace content {
19 16
20 // This is a singleton object which handles sandbox requests from the 17 // This is a singleton object which handles sandbox requests from the
21 // renderers. 18 // renderers.
22 class CONTENT_EXPORT RenderSandboxHostLinux { 19 class CONTENT_EXPORT RenderSandboxHostLinux {
23 public: 20 public:
24 // Returns the singleton instance. 21 // Returns the singleton instance.
25 static RenderSandboxHostLinux* GetInstance(); 22 static RenderSandboxHostLinux* GetInstance();
26 23
27 // Get the file descriptor which renderers should be given in order to signal 24 // Get the file descriptor which renderers should be given in order to signal
28 // crashes to the browser. 25 // crashes to the browser.
29 int GetRendererSocket() const { 26 int GetRendererSocket() const {
30 DCHECK(initialized_); 27 DCHECK(initialized_);
31 return renderer_socket_; 28 return renderer_socket_;
32 } 29 }
30 pid_t pid() const {
31 DCHECK(initialized_);
32 return pid_;
33 }
33 void Init(const std::string& sandbox_path); 34 void Init(const std::string& sandbox_path);
34 35
35 private: 36 private:
36 friend struct DefaultSingletonTraits<RenderSandboxHostLinux>; 37 friend struct DefaultSingletonTraits<RenderSandboxHostLinux>;
37 // This object must be constructed on the main thread. 38 // This object must be constructed on the main thread.
38 RenderSandboxHostLinux(); 39 RenderSandboxHostLinux();
39 ~RenderSandboxHostLinux(); 40 ~RenderSandboxHostLinux();
40 41
41 // Whether Init() has been called yet. 42 // Whether Init() has been called yet.
42 bool initialized_; 43 bool initialized_;
43 44
44 int renderer_socket_; 45 int renderer_socket_;
45 46 int childs_lifeline_fd_;
46 scoped_ptr<SandboxIPCHandler> ipc_handler_; 47 pid_t pid_;
47 scoped_ptr<base::DelegateSimpleThread> ipc_thread_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(RenderSandboxHostLinux); 49 DISALLOW_COPY_AND_ASSIGN(RenderSandboxHostLinux);
50 }; 50 };
51 51
52 } // namespace content 52 } // namespace content
53 53
54 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_ 54 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_SANDBOX_HOST_LINUX_H_
OLDNEW
« no previous file with comments | « chrome/browser/memory_details.cc ('k') | content/browser/renderer_host/render_sandbox_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698