| OLD | NEW |
| 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 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1372 // Keys: doHtmlPreloadScanning | 1372 // Keys: doHtmlPreloadScanning |
| 1373 "HtmlPreloadScanning", | 1373 "HtmlPreloadScanning", |
| 1374 | 1374 |
| 1375 // Keys: lowPriorityIframes | 1375 // Keys: lowPriorityIframes |
| 1376 "LowPriorityIFrames", | 1376 "LowPriorityIFrames", |
| 1377 | 1377 |
| 1378 // Keys: disallowFetchForDocWrittenScriptsInMainFrame | 1378 // Keys: disallowFetchForDocWrittenScriptsInMainFrame |
| 1379 "DisallowFetchForDocWrittenScriptsInMainFrame", | 1379 "DisallowFetchForDocWrittenScriptsInMainFrame", |
| 1380 | 1380 |
| 1381 // Keys: parseHTMLOnMainThreadSyncTokenize | 1381 // Keys: parseHTMLOnMainThreadSyncTokenize |
| 1382 // parseHTMLOnMainThreadCoalesceChunks |
| 1382 "ParseHTMLOnMainThread", | 1383 "ParseHTMLOnMainThread", |
| 1383 }; | 1384 }; |
| 1384 | 1385 |
| 1385 std::vector<std::string> blink_settings; | 1386 std::vector<std::string> blink_settings; |
| 1386 for (const char* field_trial_name : kBlinkSettingsFieldTrials) { | 1387 for (const char* field_trial_name : kBlinkSettingsFieldTrials) { |
| 1387 // Each blink-settings field trial should include a forcing_flag group, | 1388 // Each blink-settings field trial should include a forcing_flag group, |
| 1388 // to make sure that clients that specify the blink-settings flag on the | 1389 // to make sure that clients that specify the blink-settings flag on the |
| 1389 // command line are excluded from the experiment groups. To make | 1390 // command line are excluded from the experiment groups. To make |
| 1390 // sure we assign clients that specify this flag to the forcing_flag | 1391 // sure we assign clients that specify this flag to the forcing_flag |
| 1391 // group, we must call GetVariationParams for each field trial first | 1392 // group, we must call GetVariationParams for each field trial first |
| (...skipping 1656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3048 if (channel <= kMaxDisableEncryptionChannel) { | 3049 if (channel <= kMaxDisableEncryptionChannel) { |
| 3049 static const char* const kWebRtcDevSwitchNames[] = { | 3050 static const char* const kWebRtcDevSwitchNames[] = { |
| 3050 switches::kDisableWebRtcEncryption, | 3051 switches::kDisableWebRtcEncryption, |
| 3051 }; | 3052 }; |
| 3052 to_command_line->CopySwitchesFrom(from_command_line, | 3053 to_command_line->CopySwitchesFrom(from_command_line, |
| 3053 kWebRtcDevSwitchNames, | 3054 kWebRtcDevSwitchNames, |
| 3054 arraysize(kWebRtcDevSwitchNames)); | 3055 arraysize(kWebRtcDevSwitchNames)); |
| 3055 } | 3056 } |
| 3056 } | 3057 } |
| 3057 #endif // defined(ENABLE_WEBRTC) | 3058 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |