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

Side by Side Diff: chrome/renderer/renderer_main_platform_delegate_linux.cc

Issue 522020: clang support (Closed)
Patch Set: lgtm Created 10 years, 3 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/renderer/renderer_main_platform_delegate.h" 5 #include "chrome/renderer/renderer_main_platform_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug_util.h" 8 #include "base/debug_util.h"
9 #include "seccompsandbox/sandbox.h" 9 #include "seccompsandbox/sandbox.h"
10 10
(...skipping 18 matching lines...) Expand all
29 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox 29 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
30 return true; 30 return true;
31 } 31 }
32 32
33 bool RendererMainPlatformDelegate::EnableSandbox() { 33 bool RendererMainPlatformDelegate::EnableSandbox() {
34 // The setuid sandbox is started in the zygote process: zygote_main_linux.cc 34 // The setuid sandbox is started in the zygote process: zygote_main_linux.cc
35 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox 35 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
36 // 36 //
37 // The seccomp sandbox is started in the renderer. 37 // The seccomp sandbox is started in the renderer.
38 // http://code.google.com/p/seccompsandbox/ 38 // http://code.google.com/p/seccompsandbox/
39 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) 39 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
40 !defined(__clang__)
40 // N.b. SupportsSeccompSandbox() returns a cached result, as we already 41 // N.b. SupportsSeccompSandbox() returns a cached result, as we already
41 // called it earlier in the zygote. Thus, it is OK for us to not pass in 42 // called it earlier in the zygote. Thus, it is OK for us to not pass in
42 // a file descriptor for "/proc". 43 // a file descriptor for "/proc".
43 if (switches::SeccompSandboxEnabled() && SupportsSeccompSandbox(-1)) 44 if (switches::SeccompSandboxEnabled() && SupportsSeccompSandbox(-1))
44 StartSeccompSandbox(); 45 StartSeccompSandbox();
45 #endif 46 #endif
46 return true; 47 return true;
47 } 48 }
48 49
49 void RendererMainPlatformDelegate::RunSandboxTests() { 50 void RendererMainPlatformDelegate::RunSandboxTests() {
50 // The sandbox is started in the zygote process: zygote_main_linux.cc 51 // The sandbox is started in the zygote process: zygote_main_linux.cc
51 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox 52 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
52 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698