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

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: Rebase Created 4 years, 8 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 | chrome/chrome_tests_unit.gypi » ('j') | chrome/common/chrome_content_client.h » ('J')
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 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 switches::kEnableNewBookmarkApps, 1622 switches::kEnableNewBookmarkApps,
1623 #if defined(OS_ANDROID) 1623 #if defined(OS_ANDROID)
1624 switches::kEnableOfflinePagesAsBookmarks, 1624 switches::kEnableOfflinePagesAsBookmarks,
1625 #endif 1625 #endif
1626 switches::kEnableWasm, 1626 switches::kEnableWasm,
1627 #if !defined(DISABLE_NACL) 1627 #if !defined(DISABLE_NACL)
1628 switches::kForcePNaClSubzero, 1628 switches::kForcePNaClSubzero,
1629 #endif 1629 #endif
1630 switches::kJavaScriptHarmony, 1630 switches::kJavaScriptHarmony,
1631 switches::kMessageLoopHistogrammer, 1631 switches::kMessageLoopHistogrammer,
1632 switches::kOriginTrialPublicKey,
1632 switches::kPpapiFlashArgs, 1633 switches::kPpapiFlashArgs,
1633 switches::kPpapiFlashPath, 1634 switches::kPpapiFlashPath,
1634 switches::kPpapiFlashVersion, 1635 switches::kPpapiFlashVersion,
1635 switches::kProfilingAtStart, 1636 switches::kProfilingAtStart,
1636 switches::kProfilingFile, 1637 switches::kProfilingFile,
1637 switches::kProfilingFlush, 1638 switches::kProfilingFlush,
1638 switches::kReaderModeHeuristics, 1639 switches::kReaderModeHeuristics,
1639 switches::kUnsafelyTreatInsecureOriginAsSecure, 1640 switches::kUnsafelyTreatInsecureOriginAsSecure,
1640 translate::switches::kTranslateSecurityOrigin, 1641 translate::switches::kTranslateSecurityOrigin,
1641 }; 1642 };
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2944 if (channel <= kMaxDisableEncryptionChannel) { 2945 if (channel <= kMaxDisableEncryptionChannel) {
2945 static const char* const kWebRtcDevSwitchNames[] = { 2946 static const char* const kWebRtcDevSwitchNames[] = {
2946 switches::kDisableWebRtcEncryption, 2947 switches::kDisableWebRtcEncryption,
2947 }; 2948 };
2948 to_command_line->CopySwitchesFrom(from_command_line, 2949 to_command_line->CopySwitchesFrom(from_command_line,
2949 kWebRtcDevSwitchNames, 2950 kWebRtcDevSwitchNames,
2950 arraysize(kWebRtcDevSwitchNames)); 2951 arraysize(kWebRtcDevSwitchNames));
2951 } 2952 }
2952 } 2953 }
2953 #endif // defined(ENABLE_WEBRTC) 2954 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | chrome/common/chrome_content_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698