| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/bootstrap_sandbox_mac.h" | 5 #include "content/browser/bootstrap_sandbox_mac.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 BootstrapSandboxPolicy::~BootstrapSandboxPolicy() { | 70 BootstrapSandboxPolicy::~BootstrapSandboxPolicy() { |
| 71 BrowserChildProcessObserver::Remove(this); | 71 BrowserChildProcessObserver::Remove(this); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void BootstrapSandboxPolicy::RegisterSandboxPolicies() { | 74 void BootstrapSandboxPolicy::RegisterSandboxPolicies() { |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace | 77 } // namespace |
| 78 | 78 |
| 79 bool ShouldEnableBootstrapSandbox() { | 79 bool ShouldEnableBootstrapSandbox() { |
| 80 return base::mac::IsOSMountainLionOrEarlier() || | 80 // TODO(rsesek): Re-enable when crbug.com/501128 is fixed. |
| 81 base::mac::IsOSMavericks(); | 81 return false; |
| 82 } | 82 } |
| 83 | 83 |
| 84 sandbox::BootstrapSandbox* GetBootstrapSandbox() { | 84 sandbox::BootstrapSandbox* GetBootstrapSandbox() { |
| 85 return BootstrapSandboxPolicy::GetInstance()->sandbox(); | 85 return BootstrapSandboxPolicy::GetInstance()->sandbox(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace content | 88 } // namespace content |
| OLD | NEW |