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

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

Issue 1741783002: Add disabled origin trial feature list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch
Patch Set: Rebase; fix after crrev.com/cb60e703 landed 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
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 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 switches::kEnableNaClNonSfiMode, 1647 switches::kEnableNaClNonSfiMode,
1648 #endif 1648 #endif
1649 switches::kEnableNetBenchmarking, 1649 switches::kEnableNetBenchmarking,
1650 switches::kEnableNewBookmarkApps, 1650 switches::kEnableNewBookmarkApps,
1651 switches::kEnableWasm, 1651 switches::kEnableWasm,
1652 #if !defined(DISABLE_NACL) 1652 #if !defined(DISABLE_NACL)
1653 switches::kForcePNaClSubzero, 1653 switches::kForcePNaClSubzero,
1654 #endif 1654 #endif
1655 switches::kJavaScriptHarmony, 1655 switches::kJavaScriptHarmony,
1656 switches::kMessageLoopHistogrammer, 1656 switches::kMessageLoopHistogrammer,
1657 switches::kOriginTrialDisabledFeatures,
1657 switches::kOriginTrialPublicKey, 1658 switches::kOriginTrialPublicKey,
1658 switches::kPpapiFlashArgs, 1659 switches::kPpapiFlashArgs,
1659 switches::kPpapiFlashPath, 1660 switches::kPpapiFlashPath,
1660 switches::kPpapiFlashVersion, 1661 switches::kPpapiFlashVersion,
1661 switches::kProfilingAtStart, 1662 switches::kProfilingAtStart,
1662 switches::kProfilingFile, 1663 switches::kProfilingFile,
1663 switches::kProfilingFlush, 1664 switches::kProfilingFlush,
1664 switches::kReaderModeHeuristics, 1665 switches::kReaderModeHeuristics,
1665 switches::kUnsafelyTreatInsecureOriginAsSecure, 1666 switches::kUnsafelyTreatInsecureOriginAsSecure,
1666 translate::switches::kTranslateSecurityOrigin, 1667 translate::switches::kTranslateSecurityOrigin,
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
2999 if (channel <= kMaxDisableEncryptionChannel) { 3000 if (channel <= kMaxDisableEncryptionChannel) {
3000 static const char* const kWebRtcDevSwitchNames[] = { 3001 static const char* const kWebRtcDevSwitchNames[] = {
3001 switches::kDisableWebRtcEncryption, 3002 switches::kDisableWebRtcEncryption,
3002 }; 3003 };
3003 to_command_line->CopySwitchesFrom(from_command_line, 3004 to_command_line->CopySwitchesFrom(from_command_line,
3004 kWebRtcDevSwitchNames, 3005 kWebRtcDevSwitchNames,
3005 arraysize(kWebRtcDevSwitchNames)); 3006 arraysize(kWebRtcDevSwitchNames));
3006 } 3007 }
3007 } 3008 }
3008 #endif // defined(ENABLE_WEBRTC) 3009 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698