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

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

Issue 1737693002: Allow command-line arguments to override EF public key (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove new method from content API Created 4 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/chrome_tests_unit.gypi » ('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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1625 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 switches::kEnableNaClNonSfiMode, 1636 switches::kEnableNaClNonSfiMode,
1637 #endif 1637 #endif
1638 switches::kEnableNetBenchmarking, 1638 switches::kEnableNetBenchmarking,
1639 switches::kEnableNewBookmarkApps, 1639 switches::kEnableNewBookmarkApps,
1640 switches::kEnableWasm, 1640 switches::kEnableWasm,
1641 #if !defined(DISABLE_NACL) 1641 #if !defined(DISABLE_NACL)
1642 switches::kForcePNaClSubzero, 1642 switches::kForcePNaClSubzero,
1643 #endif 1643 #endif
1644 switches::kJavaScriptHarmony, 1644 switches::kJavaScriptHarmony,
1645 switches::kMessageLoopHistogrammer, 1645 switches::kMessageLoopHistogrammer,
1646 switches::kOriginTrialPublicKey,
1646 switches::kPpapiFlashArgs, 1647 switches::kPpapiFlashArgs,
1647 switches::kPpapiFlashPath, 1648 switches::kPpapiFlashPath,
1648 switches::kPpapiFlashVersion, 1649 switches::kPpapiFlashVersion,
1649 switches::kProfilingAtStart, 1650 switches::kProfilingAtStart,
1650 switches::kProfilingFile, 1651 switches::kProfilingFile,
1651 switches::kProfilingFlush, 1652 switches::kProfilingFlush,
1652 switches::kReaderModeHeuristics, 1653 switches::kReaderModeHeuristics,
1653 switches::kUnsafelyTreatInsecureOriginAsSecure, 1654 switches::kUnsafelyTreatInsecureOriginAsSecure,
1654 translate::switches::kTranslateSecurityOrigin, 1655 translate::switches::kTranslateSecurityOrigin,
1655 }; 1656 };
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
2957 if (channel <= kMaxDisableEncryptionChannel) { 2958 if (channel <= kMaxDisableEncryptionChannel) {
2958 static const char* const kWebRtcDevSwitchNames[] = { 2959 static const char* const kWebRtcDevSwitchNames[] = {
2959 switches::kDisableWebRtcEncryption, 2960 switches::kDisableWebRtcEncryption,
2960 }; 2961 };
2961 to_command_line->CopySwitchesFrom(from_command_line, 2962 to_command_line->CopySwitchesFrom(from_command_line,
2962 kWebRtcDevSwitchNames, 2963 kWebRtcDevSwitchNames,
2963 arraysize(kWebRtcDevSwitchNames)); 2964 arraysize(kWebRtcDevSwitchNames));
2964 } 2965 }
2965 } 2966 }
2966 #endif // defined(ENABLE_WEBRTC) 2967 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698