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

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

Issue 177113009: Support non-SFI mode in NaCl manifest file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 9 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
« no previous file with comments | « no previous file | components/nacl/browser/nacl_host_message_filter.cc » ('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 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 switches::kCloudPrintServiceURL, 1566 switches::kCloudPrintServiceURL,
1567 switches::kDisableBundledPpapiFlash, 1567 switches::kDisableBundledPpapiFlash,
1568 switches::kDisableExtensionsResourceWhitelist, 1568 switches::kDisableExtensionsResourceWhitelist,
1569 switches::kDisablePnacl, 1569 switches::kDisablePnacl,
1570 switches::kDisableScriptedPrintThrottling, 1570 switches::kDisableScriptedPrintThrottling,
1571 switches::kEnableAdview, 1571 switches::kEnableAdview,
1572 switches::kEnableAppWindowControls, 1572 switches::kEnableAppWindowControls,
1573 switches::kEnableBenchmarking, 1573 switches::kEnableBenchmarking,
1574 switches::kEnableNaCl, 1574 switches::kEnableNaCl,
1575 switches::kEnableNaClDebug, 1575 switches::kEnableNaClDebug,
1576 switches::kEnableNaClNonSfiMode,
1576 switches::kEnableNetBenchmarking, 1577 switches::kEnableNetBenchmarking,
1577 switches::kEnableStreamlinedHostedApps, 1578 switches::kEnableStreamlinedHostedApps,
1578 switches::kEnableWatchdog, 1579 switches::kEnableWatchdog,
1579 switches::kMemoryProfiling, 1580 switches::kMemoryProfiling,
1580 switches::kMessageLoopHistogrammer, 1581 switches::kMessageLoopHistogrammer,
1581 switches::kNoJsRandomness, 1582 switches::kNoJsRandomness,
1582 switches::kOutOfProcessPdf, 1583 switches::kOutOfProcessPdf,
1583 switches::kPlaybackMode, 1584 switches::kPlaybackMode,
1584 switches::kPpapiFlashArgs, 1585 switches::kPpapiFlashArgs,
1585 switches::kPpapiFlashPath, 1586 switches::kPpapiFlashPath,
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
2730 switches::kDisableWebRtcEncryption, 2731 switches::kDisableWebRtcEncryption,
2731 }; 2732 };
2732 to_command_line->CopySwitchesFrom(from_command_line, 2733 to_command_line->CopySwitchesFrom(from_command_line,
2733 kWebRtcDevSwitchNames, 2734 kWebRtcDevSwitchNames,
2734 arraysize(kWebRtcDevSwitchNames)); 2735 arraysize(kWebRtcDevSwitchNames));
2735 } 2736 }
2736 } 2737 }
2737 #endif // defined(ENABLE_WEBRTC) 2738 #endif // defined(ENABLE_WEBRTC)
2738 2739
2739 } // namespace chrome 2740 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | components/nacl/browser/nacl_host_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698