| 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 "HtmlPreloadScanning", | 1377 "HtmlPreloadScanning", |
| 1378 | 1378 |
| 1379 // Keys: lowPriorityIframes | 1379 // Keys: lowPriorityIframes |
| 1380 "LowPriorityIFrames", | 1380 "LowPriorityIFrames", |
| 1381 | 1381 |
| 1382 // Keys: disallowFetchForDocWrittenScriptsInMainFrame | 1382 // Keys: disallowFetchForDocWrittenScriptsInMainFrame |
| 1383 "DisallowFetchForDocWrittenScriptsInMainFrame", | 1383 "DisallowFetchForDocWrittenScriptsInMainFrame", |
| 1384 | 1384 |
| 1385 // Keys: parseHTMLOnMainThreadSyncTokenize | 1385 // Keys: parseHTMLOnMainThreadSyncTokenize |
| 1386 "ParseHTMLOnMainThread", | 1386 "ParseHTMLOnMainThread", |
| 1387 |
| 1388 // Keys: cssExternalScannerNoPreload |
| 1389 // cssExternalScannerPreload |
| 1390 "CSSExternalScanner", |
| 1387 }; | 1391 }; |
| 1388 | 1392 |
| 1389 std::vector<std::string> blink_settings; | 1393 std::vector<std::string> blink_settings; |
| 1390 for (const char* field_trial_name : kBlinkSettingsFieldTrials) { | 1394 for (const char* field_trial_name : kBlinkSettingsFieldTrials) { |
| 1391 // Each blink-settings field trial should include a forcing_flag group, | 1395 // Each blink-settings field trial should include a forcing_flag group, |
| 1392 // to make sure that clients that specify the blink-settings flag on the | 1396 // to make sure that clients that specify the blink-settings flag on the |
| 1393 // command line are excluded from the experiment groups. To make | 1397 // command line are excluded from the experiment groups. To make |
| 1394 // sure we assign clients that specify this flag to the forcing_flag | 1398 // sure we assign clients that specify this flag to the forcing_flag |
| 1395 // group, we must call GetVariationParams for each field trial first | 1399 // group, we must call GetVariationParams for each field trial first |
| 1396 // (for example, before checking HasSwitch() and returning), since | 1400 // (for example, before checking HasSwitch() and returning), since |
| (...skipping 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3056 if (channel <= kMaxDisableEncryptionChannel) { | 3060 if (channel <= kMaxDisableEncryptionChannel) { |
| 3057 static const char* const kWebRtcDevSwitchNames[] = { | 3061 static const char* const kWebRtcDevSwitchNames[] = { |
| 3058 switches::kDisableWebRtcEncryption, | 3062 switches::kDisableWebRtcEncryption, |
| 3059 }; | 3063 }; |
| 3060 to_command_line->CopySwitchesFrom(from_command_line, | 3064 to_command_line->CopySwitchesFrom(from_command_line, |
| 3061 kWebRtcDevSwitchNames, | 3065 kWebRtcDevSwitchNames, |
| 3062 arraysize(kWebRtcDevSwitchNames)); | 3066 arraysize(kWebRtcDevSwitchNames)); |
| 3063 } | 3067 } |
| 3064 } | 3068 } |
| 3065 #endif // defined(ENABLE_WEBRTC) | 3069 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |