OLD | NEW |
---|---|
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 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 5 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
6 | 6 |
7 #include <sys/socket.h> | 7 #include <sys/socket.h> |
8 #include <sys/stat.h> | 8 #include <sys/stat.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 #include <unistd.h> | 10 #include <unistd.h> |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
106 switches::kVModule, | 106 switches::kVModule, |
107 switches::kRegisterPepperPlugins, | 107 switches::kRegisterPepperPlugins, |
108 switches::kDisableSeccompFilterSandbox, | 108 switches::kDisableSeccompFilterSandbox, |
109 | 109 |
110 // Zygote process needs to know what resources to have loaded when it | 110 // Zygote process needs to know what resources to have loaded when it |
111 // becomes a renderer process. | 111 // becomes a renderer process. |
112 switches::kForceDeviceScaleFactor, | 112 switches::kForceDeviceScaleFactor, |
113 switches::kTouchOptimizedUI, | 113 switches::kTouchOptimizedUI, |
114 | 114 |
115 switches::kNoSandbox, | 115 switches::kNoSandbox, |
116 switches::kDisableNaClSfi, | |
Mark Seaborn
2013/12/06 21:42:37
The content/ directory is not supposed to have ref
hidehiko
2013/12/09 07:43:39
Great to know. Done.
| |
116 }; | 117 }; |
117 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, | 118 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, |
118 arraysize(kForwardSwitches)); | 119 arraysize(kForwardSwitches)); |
119 | 120 |
120 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1); | 121 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1); |
121 | 122 |
122 sandbox_binary_ = sandbox_cmd.c_str(); | 123 sandbox_binary_ = sandbox_cmd.c_str(); |
123 | 124 |
124 // A non empty sandbox_cmd means we want a SUID sandbox. | 125 // A non empty sandbox_cmd means we want a SUID sandbox. |
125 using_suid_sandbox_ = !sandbox_cmd.empty(); | 126 using_suid_sandbox_ = !sandbox_cmd.empty(); |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
472 return RenderSandboxHostLinux::GetInstance()->pid(); | 473 return RenderSandboxHostLinux::GetInstance()->pid(); |
473 } | 474 } |
474 | 475 |
475 int ZygoteHostImpl::GetSandboxStatus() const { | 476 int ZygoteHostImpl::GetSandboxStatus() const { |
476 if (have_read_sandbox_status_word_) | 477 if (have_read_sandbox_status_word_) |
477 return sandbox_status_; | 478 return sandbox_status_; |
478 return 0; | 479 return 0; |
479 } | 480 } |
480 | 481 |
481 } // namespace content | 482 } // namespace content |
OLD | NEW |