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

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: Const correctness; clear disabled features Created 4 years, 6 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 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 switches::kEnableNaClNonSfiMode, 1606 switches::kEnableNaClNonSfiMode,
1607 #endif 1607 #endif
1608 switches::kEnableNetBenchmarking, 1608 switches::kEnableNetBenchmarking,
1609 switches::kEnableNewBookmarkApps, 1609 switches::kEnableNewBookmarkApps,
1610 switches::kEnableWasm, 1610 switches::kEnableWasm,
1611 #if !defined(DISABLE_NACL) 1611 #if !defined(DISABLE_NACL)
1612 switches::kForcePNaClSubzero, 1612 switches::kForcePNaClSubzero,
1613 #endif 1613 #endif
1614 switches::kJavaScriptHarmony, 1614 switches::kJavaScriptHarmony,
1615 switches::kMessageLoopHistogrammer, 1615 switches::kMessageLoopHistogrammer,
1616 switches::kOriginTrialDisabledFeatures,
1616 switches::kOriginTrialPublicKey, 1617 switches::kOriginTrialPublicKey,
1617 switches::kPpapiFlashArgs, 1618 switches::kPpapiFlashArgs,
1618 switches::kPpapiFlashPath, 1619 switches::kPpapiFlashPath,
1619 switches::kPpapiFlashVersion, 1620 switches::kPpapiFlashVersion,
1620 switches::kProfilingAtStart, 1621 switches::kProfilingAtStart,
1621 switches::kProfilingFile, 1622 switches::kProfilingFile,
1622 switches::kProfilingFlush, 1623 switches::kProfilingFlush,
1623 switches::kReaderModeHeuristics, 1624 switches::kReaderModeHeuristics,
1624 switches::kUnsafelyTreatInsecureOriginAsSecure, 1625 switches::kUnsafelyTreatInsecureOriginAsSecure,
1625 translate::switches::kTranslateSecurityOrigin, 1626 translate::switches::kTranslateSecurityOrigin,
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
2972 if (channel <= kMaxDisableEncryptionChannel) { 2973 if (channel <= kMaxDisableEncryptionChannel) {
2973 static const char* const kWebRtcDevSwitchNames[] = { 2974 static const char* const kWebRtcDevSwitchNames[] = {
2974 switches::kDisableWebRtcEncryption, 2975 switches::kDisableWebRtcEncryption,
2975 }; 2976 };
2976 to_command_line->CopySwitchesFrom(from_command_line, 2977 to_command_line->CopySwitchesFrom(from_command_line,
2977 kWebRtcDevSwitchNames, 2978 kWebRtcDevSwitchNames,
2978 arraysize(kWebRtcDevSwitchNames)); 2979 arraysize(kWebRtcDevSwitchNames));
2979 } 2980 }
2980 } 2981 }
2981 #endif // defined(ENABLE_WEBRTC) 2982 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698