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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 670603002: Linux sandbox: Tighten up the NaCl sandbox policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Have a pid member instead. Created 6 years, 1 month 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) 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1389 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 }; 1400 };
1401 1401
1402 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1402 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1403 arraysize(kSwitchNames)); 1403 arraysize(kSwitchNames));
1404 #endif 1404 #endif
1405 } else if (process_type == switches::kZygoteProcess) { 1405 } else if (process_type == switches::kZygoteProcess) {
1406 static const char* const kSwitchNames[] = { 1406 static const char* const kSwitchNames[] = {
1407 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1407 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1408 switches::kDisableBundledPpapiFlash, 1408 switches::kDisableBundledPpapiFlash,
1409 #if !defined(DISABLE_NACL) 1409 #if !defined(DISABLE_NACL)
1410 switches::kEnableNaClDebug,
1410 switches::kEnableNaClNonSfiMode, 1411 switches::kEnableNaClNonSfiMode,
1411 switches::kNaClDangerousNoSandboxNonSfi, 1412 switches::kNaClDangerousNoSandboxNonSfi,
1412 #endif 1413 #endif
1413 switches::kPpapiFlashPath, 1414 switches::kPpapiFlashPath,
1414 switches::kPpapiFlashVersion, 1415 switches::kPpapiFlashVersion,
1415 }; 1416 };
1416 1417
1417 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1418 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1418 arraysize(kSwitchNames)); 1419 arraysize(kSwitchNames));
1419 } else if (process_type == switches::kGpuProcess) { 1420 } else if (process_type == switches::kGpuProcess) {
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 switches::kDisableWebRtcEncryption, 2612 switches::kDisableWebRtcEncryption,
2612 }; 2613 };
2613 to_command_line->CopySwitchesFrom(from_command_line, 2614 to_command_line->CopySwitchesFrom(from_command_line,
2614 kWebRtcDevSwitchNames, 2615 kWebRtcDevSwitchNames,
2615 arraysize(kWebRtcDevSwitchNames)); 2616 arraysize(kWebRtcDevSwitchNames));
2616 } 2617 }
2617 } 2618 }
2618 #endif // defined(ENABLE_WEBRTC) 2619 #endif // defined(ENABLE_WEBRTC)
2619 2620
2620 } // namespace chrome 2621 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | components/nacl/loader/DEPS » ('j') | components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698