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/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
6 | 6 |
7 #include <iterator> | 7 #include <iterator> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
750 switches::kAutoplayPolicy, | 750 switches::kAutoplayPolicy, |
751 switches::autoplay::kNoUserGestureRequiredPolicy}, | 751 switches::autoplay::kNoUserGestureRequiredPolicy}, |
752 #if defined(OS_ANDROID) | 752 #if defined(OS_ANDROID) |
753 {flag_descriptions::kAutoplayPolicyUserGestureRequired, | 753 {flag_descriptions::kAutoplayPolicyUserGestureRequired, |
754 switches::kAutoplayPolicy, switches::autoplay::kUserGestureRequiredPolicy}, | 754 switches::kAutoplayPolicy, switches::autoplay::kUserGestureRequiredPolicy}, |
755 #else | 755 #else |
756 {flag_descriptions::kAutoplayPolicyUserGestureRequiredForCrossOrigin, | 756 {flag_descriptions::kAutoplayPolicyUserGestureRequiredForCrossOrigin, |
757 switches::kAutoplayPolicy, | 757 switches::kAutoplayPolicy, |
758 switches::autoplay::kUserGestureRequiredForCrossOriginPolicy}, | 758 switches::autoplay::kUserGestureRequiredForCrossOriginPolicy}, |
759 #endif | 759 #endif |
| 760 {flag_descriptions::kAutoplayPolicyDocumentUserActivation, |
| 761 switches::kAutoplayPolicy, |
| 762 switches::autoplay::kDocumentUserActivationRequiredPolicy}, |
760 }; | 763 }; |
761 | 764 |
762 const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { | 765 const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { |
763 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, | 766 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, |
764 {flag_descriptions::kEffectiveConnectionTypeUnknownDescription, | 767 {flag_descriptions::kEffectiveConnectionTypeUnknownDescription, |
765 switches::kForceEffectiveConnectionType, | 768 switches::kForceEffectiveConnectionType, |
766 net::kEffectiveConnectionTypeUnknown}, | 769 net::kEffectiveConnectionTypeUnknown}, |
767 {flag_descriptions::kEffectiveConnectionTypeOfflineDescription, | 770 {flag_descriptions::kEffectiveConnectionTypeOfflineDescription, |
768 switches::kForceEffectiveConnectionType, | 771 switches::kForceEffectiveConnectionType, |
769 net::kEffectiveConnectionTypeOffline}, | 772 net::kEffectiveConnectionTypeOffline}, |
(...skipping 2513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3283 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3286 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3284 | 3287 |
3285 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3288 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3286 *count = arraysize(kFeatureEntries); | 3289 *count = arraysize(kFeatureEntries); |
3287 return kFeatureEntries; | 3290 return kFeatureEntries; |
3288 } | 3291 } |
3289 | 3292 |
3290 } // namespace testing | 3293 } // namespace testing |
3291 | 3294 |
3292 } // namespace about_flags | 3295 } // namespace about_flags |
OLD | NEW |