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

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: Rebase 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
« no previous file with comments | « no previous file | components/nacl/loader/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1403 }; 1403 };
1404 1404
1405 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1405 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1406 arraysize(kSwitchNames)); 1406 arraysize(kSwitchNames));
1407 #endif 1407 #endif
1408 } else if (process_type == switches::kZygoteProcess) { 1408 } else if (process_type == switches::kZygoteProcess) {
1409 static const char* const kSwitchNames[] = { 1409 static const char* const kSwitchNames[] = {
1410 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1410 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1411 switches::kDisableBundledPpapiFlash, 1411 switches::kDisableBundledPpapiFlash,
1412 #if !defined(DISABLE_NACL) 1412 #if !defined(DISABLE_NACL)
1413 switches::kEnableNaClDebug,
1413 switches::kEnableNaClNonSfiMode, 1414 switches::kEnableNaClNonSfiMode,
1414 switches::kNaClDangerousNoSandboxNonSfi, 1415 switches::kNaClDangerousNoSandboxNonSfi,
1415 #endif 1416 #endif
1416 switches::kPpapiFlashPath, 1417 switches::kPpapiFlashPath,
1417 switches::kPpapiFlashVersion, 1418 switches::kPpapiFlashVersion,
1418 }; 1419 };
1419 1420
1420 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1421 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1421 arraysize(kSwitchNames)); 1422 arraysize(kSwitchNames));
1422 } else if (process_type == switches::kGpuProcess) { 1423 } else if (process_type == switches::kGpuProcess) {
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 switches::kDisableWebRtcEncryption, 2670 switches::kDisableWebRtcEncryption,
2670 }; 2671 };
2671 to_command_line->CopySwitchesFrom(from_command_line, 2672 to_command_line->CopySwitchesFrom(from_command_line,
2672 kWebRtcDevSwitchNames, 2673 kWebRtcDevSwitchNames,
2673 arraysize(kWebRtcDevSwitchNames)); 2674 arraysize(kWebRtcDevSwitchNames));
2674 } 2675 }
2675 } 2676 }
2676 #endif // defined(ENABLE_WEBRTC) 2677 #endif // defined(ENABLE_WEBRTC)
2677 2678
2678 } // namespace chrome 2679 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | components/nacl/loader/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698