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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1541 command_line->AppendSwitch(switches::kInstantProcess); | 1541 command_line->AppendSwitch(switches::kInstantProcess); |
1542 | 1542 |
1543 #if !defined(OS_CHROMEOS) | 1543 #if !defined(OS_CHROMEOS) |
1544 SigninManager* signin_manager = | 1544 SigninManager* signin_manager = |
1545 SigninManagerFactory::GetForProfile(profile); | 1545 SigninManagerFactory::GetForProfile(profile); |
1546 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) | 1546 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) |
1547 command_line->AppendSwitch(switches::kSigninProcess); | 1547 command_line->AppendSwitch(switches::kSigninProcess); |
1548 #endif | 1548 #endif |
1549 } | 1549 } |
1550 | 1550 |
| 1551 { |
| 1552 // Enable auto-reload if this session is in the field trial or the user |
| 1553 // explicitly enabled it. |
| 1554 std::string group = |
| 1555 base::FieldTrialList::FindFullName("AutoReloadExperiment"); |
| 1556 if (group == "Enabled" || |
| 1557 browser_command_line.HasSwitch(switches::kEnableOfflineAutoReload)) { |
| 1558 command_line->AppendSwitch(switches::kEnableOfflineAutoReload); |
| 1559 } |
| 1560 } |
| 1561 |
1551 // Please keep this in alphabetical order. | 1562 // Please keep this in alphabetical order. |
1552 static const char* const kSwitchNames[] = { | 1563 static const char* const kSwitchNames[] = { |
1553 autofill::switches::kDisableIgnoreAutocompleteOff, | 1564 autofill::switches::kDisableIgnoreAutocompleteOff, |
1554 autofill::switches::kDisableInteractiveAutocomplete, | 1565 autofill::switches::kDisableInteractiveAutocomplete, |
1555 autofill::switches::kDisablePasswordGeneration, | 1566 autofill::switches::kDisablePasswordGeneration, |
1556 autofill::switches::kEnableInteractiveAutocomplete, | 1567 autofill::switches::kEnableInteractiveAutocomplete, |
1557 autofill::switches::kEnablePasswordGeneration, | 1568 autofill::switches::kEnablePasswordGeneration, |
1558 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration, | 1569 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration, |
1559 extensions::switches::kAllowHTTPBackgroundPage, | 1570 extensions::switches::kAllowHTTPBackgroundPage, |
1560 extensions::switches::kAllowLegacyExtensionManifests, | 1571 extensions::switches::kAllowLegacyExtensionManifests, |
1561 extensions::switches::kEnableExperimentalExtensionApis, | 1572 extensions::switches::kEnableExperimentalExtensionApis, |
1562 extensions::switches::kExtensionsOnChromeURLs, | 1573 extensions::switches::kExtensionsOnChromeURLs, |
1563 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO | 1574 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO |
1564 // to browser. | 1575 // to browser. |
1565 switches::kAllowNaClFileHandleAPI, | 1576 switches::kAllowNaClFileHandleAPI, |
1566 switches::kAppsCheckoutURL, | 1577 switches::kAppsCheckoutURL, |
1567 switches::kAppsGalleryURL, | 1578 switches::kAppsGalleryURL, |
1568 switches::kCloudPrintServiceURL, | 1579 switches::kCloudPrintServiceURL, |
1569 switches::kDisableBundledPpapiFlash, | 1580 switches::kDisableBundledPpapiFlash, |
1570 switches::kDisableExtensionsResourceWhitelist, | 1581 switches::kDisableExtensionsResourceWhitelist, |
1571 switches::kDisablePnacl, | 1582 switches::kDisablePnacl, |
1572 switches::kDisableScriptedPrintThrottling, | 1583 switches::kDisableScriptedPrintThrottling, |
1573 switches::kEnableAdview, | 1584 switches::kEnableAdview, |
1574 switches::kEnableAppWindowControls, | 1585 switches::kEnableAppWindowControls, |
1575 switches::kEnableBenchmarking, | 1586 switches::kEnableBenchmarking, |
1576 switches::kEnableNaCl, | 1587 switches::kEnableNaCl, |
1577 switches::kEnableNaClDebug, | 1588 switches::kEnableNaClDebug, |
1578 switches::kEnableNaClNonSfiMode, | 1589 switches::kEnableNaClNonSfiMode, |
1579 switches::kEnableNetBenchmarking, | 1590 switches::kEnableNetBenchmarking, |
1580 switches::kEnableOfflineAutoReload, | |
1581 switches::kEnableStreamlinedHostedApps, | 1591 switches::kEnableStreamlinedHostedApps, |
1582 switches::kEnableWatchdog, | 1592 switches::kEnableWatchdog, |
1583 switches::kMemoryProfiling, | 1593 switches::kMemoryProfiling, |
1584 switches::kMessageLoopHistogrammer, | 1594 switches::kMessageLoopHistogrammer, |
1585 switches::kNoJsRandomness, | 1595 switches::kNoJsRandomness, |
1586 switches::kOutOfProcessPdf, | 1596 switches::kOutOfProcessPdf, |
1587 switches::kPlaybackMode, | 1597 switches::kPlaybackMode, |
1588 switches::kPpapiFlashArgs, | 1598 switches::kPpapiFlashArgs, |
1589 switches::kPpapiFlashPath, | 1599 switches::kPpapiFlashPath, |
1590 switches::kPpapiFlashVersion, | 1600 switches::kPpapiFlashVersion, |
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2735 switches::kDisableWebRtcEncryption, | 2745 switches::kDisableWebRtcEncryption, |
2736 }; | 2746 }; |
2737 to_command_line->CopySwitchesFrom(from_command_line, | 2747 to_command_line->CopySwitchesFrom(from_command_line, |
2738 kWebRtcDevSwitchNames, | 2748 kWebRtcDevSwitchNames, |
2739 arraysize(kWebRtcDevSwitchNames)); | 2749 arraysize(kWebRtcDevSwitchNames)); |
2740 } | 2750 } |
2741 } | 2751 } |
2742 #endif // defined(ENABLE_WEBRTC) | 2752 #endif // defined(ENABLE_WEBRTC) |
2743 | 2753 |
2744 } // namespace chrome | 2754 } // namespace chrome |
OLD | NEW |