Chromium Code Reviews| Index: content/public/common/sandboxed_process_launcher_delegate.h |
| diff --git a/content/public/common/sandboxed_process_launcher_delegate.h b/content/public/common/sandboxed_process_launcher_delegate.h |
| index 134fc0f58efe42d2d61ae58367fc716129be53c2..f3ddc39c39de02a653fd622e1e475d7ca6437582 100644 |
| --- a/content/public/common/sandboxed_process_launcher_delegate.h |
| +++ b/content/public/common/sandboxed_process_launcher_delegate.h |
| @@ -9,10 +9,7 @@ |
| #include "base/files/scoped_file.h" |
| #include "base/process/process.h" |
| #include "content/common/content_export.h" |
| - |
| -#if defined(OS_MACOSX) |
| -#include "content/public/common/sandbox_type_mac.h" |
| -#endif |
| +#include "content/public/common/sandbox_type.h" |
| namespace base { |
| class FilePath; |
| @@ -66,13 +63,10 @@ class CONTENT_EXPORT SandboxedProcessLauncherDelegate { |
| // Return the file descriptor for the IPC channel. |
| virtual base::ScopedFD TakeIpcFd() = 0; |
| -#if defined(OS_MACOSX) |
| - // Gets the Mac SandboxType to enforce on the process. Return |
| - // SANDBOX_TYPE_INVALID for no sandbox policy. |
| - virtual SandboxType GetSandboxType(); |
| -#endif |
| - |
| #endif |
|
nasko
2015/06/19 12:18:19
nit: empty line after the #endif, before the comme
Will Harris
2015/06/23 16:21:11
Done, but looks weird now, I couldn't find the sta
|
| + // Gets the SandboxType to enforce on the process. Return SANDBOX_TYPE_INVALID |
|
nasko
2015/06/19 12:18:20
nit: Returns
Will Harris
2015/06/23 16:21:11
Done.
nasko
2015/06/24 08:04:08
I don't see the changes in this file from the prev
Will Harris
2015/06/24 11:37:09
Sorry, I was going to upload them with the same PS
|
| + // for no sandbox policy. |
| + virtual SandboxType GetSandboxType(); |
| }; |
| } // namespace content |