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

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; style fixes Created 4 years, 10 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 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 switches::kEnableNetBenchmarking, 1635 switches::kEnableNetBenchmarking,
1636 switches::kEnableNewBookmarkApps, 1636 switches::kEnableNewBookmarkApps,
1637 #if defined(OS_ANDROID) 1637 #if defined(OS_ANDROID)
1638 switches::kEnableOfflinePagesAsBookmarks, 1638 switches::kEnableOfflinePagesAsBookmarks,
1639 #endif 1639 #endif
1640 #if !defined(DISABLE_NACL) 1640 #if !defined(DISABLE_NACL)
1641 switches::kForcePNaClSubzero, 1641 switches::kForcePNaClSubzero,
1642 #endif 1642 #endif
1643 switches::kJavaScriptHarmony, 1643 switches::kJavaScriptHarmony,
1644 switches::kMessageLoopHistogrammer, 1644 switches::kMessageLoopHistogrammer,
1645 switches::kOriginTrialDisabledFeatures,
1645 switches::kOriginTrialPublicKey, 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,
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
2928 if (channel <= kMaxDisableEncryptionChannel) { 2929 if (channel <= kMaxDisableEncryptionChannel) {
2929 static const char* const kWebRtcDevSwitchNames[] = { 2930 static const char* const kWebRtcDevSwitchNames[] = {
2930 switches::kDisableWebRtcEncryption, 2931 switches::kDisableWebRtcEncryption,
2931 }; 2932 };
2932 to_command_line->CopySwitchesFrom(from_command_line, 2933 to_command_line->CopySwitchesFrom(from_command_line,
2933 kWebRtcDevSwitchNames, 2934 kWebRtcDevSwitchNames,
2934 arraysize(kWebRtcDevSwitchNames)); 2935 arraysize(kWebRtcDevSwitchNames));
2935 } 2936 }
2936 } 2937 }
2937 #endif // defined(ENABLE_WEBRTC) 2938 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698