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

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

Issue 279693002: Split NaCl SFI and non-SFI helpers into separate processes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to mseaborn feedback Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | components/nacl.gyp » ('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 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 switches::kMemoryProfiling, 1677 switches::kMemoryProfiling,
1678 switches::kSilentDumpOnDCHECK, 1678 switches::kSilentDumpOnDCHECK,
1679 }; 1679 };
1680 1680
1681 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1681 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1682 arraysize(kSwitchNames)); 1682 arraysize(kSwitchNames));
1683 } else if (process_type == switches::kZygoteProcess) { 1683 } else if (process_type == switches::kZygoteProcess) {
1684 static const char* const kSwitchNames[] = { 1684 static const char* const kSwitchNames[] = {
1685 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1685 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1686 switches::kDisableBundledPpapiFlash, 1686 switches::kDisableBundledPpapiFlash,
1687 switches::kEnableNaClNonSfiMode,
1687 switches::kNaClDangerousNoSandboxNonSfi, 1688 switches::kNaClDangerousNoSandboxNonSfi,
1688 switches::kPpapiFlashPath, 1689 switches::kPpapiFlashPath,
1689 switches::kPpapiFlashVersion, 1690 switches::kPpapiFlashVersion,
1690 }; 1691 };
1691 1692
1692 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1693 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1693 arraysize(kSwitchNames)); 1694 arraysize(kSwitchNames));
1694 } else if (process_type == switches::kGpuProcess) { 1695 } else if (process_type == switches::kGpuProcess) {
1695 // If --ignore-gpu-blacklist is passed in, don't send in crash reports 1696 // If --ignore-gpu-blacklist is passed in, don't send in crash reports
1696 // because GPU is expected to be unreliable. 1697 // because GPU is expected to be unreliable.
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2715 switches::kDisableWebRtcEncryption, 2716 switches::kDisableWebRtcEncryption,
2716 }; 2717 };
2717 to_command_line->CopySwitchesFrom(from_command_line, 2718 to_command_line->CopySwitchesFrom(from_command_line,
2718 kWebRtcDevSwitchNames, 2719 kWebRtcDevSwitchNames,
2719 arraysize(kWebRtcDevSwitchNames)); 2720 arraysize(kWebRtcDevSwitchNames));
2720 } 2721 }
2721 } 2722 }
2722 #endif // defined(ENABLE_WEBRTC) 2723 #endif // defined(ENABLE_WEBRTC)
2723 2724
2724 } // namespace chrome 2725 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698