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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2846623003: Make autoplay policies no longer platform dependant. (Closed)
Patch Set: bauerb review comments Created 3 years, 7 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/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 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 707
708 const FeatureEntry::Choice kAutoplayPolicyChoices[] = { 708 const FeatureEntry::Choice kAutoplayPolicyChoices[] = {
709 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 709 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
710 {flag_descriptions::kAutoplayPolicyNoUserGestureRequired, 710 {flag_descriptions::kAutoplayPolicyNoUserGestureRequired,
711 switches::kAutoplayPolicy, 711 switches::kAutoplayPolicy,
712 switches::autoplay::kNoUserGestureRequiredPolicy}, 712 switches::autoplay::kNoUserGestureRequiredPolicy},
713 #if defined(OS_ANDROID) 713 #if defined(OS_ANDROID)
714 {flag_descriptions::kAutoplayPolicyUserGestureRequired, 714 {flag_descriptions::kAutoplayPolicyUserGestureRequired,
715 switches::kAutoplayPolicy, switches::autoplay::kUserGestureRequiredPolicy}, 715 switches::kAutoplayPolicy, switches::autoplay::kUserGestureRequiredPolicy},
716 #else 716 #else
717 {flag_descriptions::kAutoplayPolicyCrossOriginUserGestureRequired, 717 {flag_descriptions::kAutoplayPolicyUserGestureRequiredForCrossOrigin,
718 switches::kAutoplayPolicy, 718 switches::kAutoplayPolicy,
719 switches::autoplay::kCrossOriginUserGestureRequiredPolicy}, 719 switches::autoplay::kUserGestureRequiredForCrossOriginPolicy},
720 #endif 720 #endif
721 }; 721 };
722 722
723 const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { 723 const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
724 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 724 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
725 {flag_descriptions::kEffectiveConnectionTypeUnknownDescription, 725 {flag_descriptions::kEffectiveConnectionTypeUnknownDescription,
726 switches::kForceEffectiveConnectionType, 726 switches::kForceEffectiveConnectionType,
727 net::kEffectiveConnectionTypeUnknown}, 727 net::kEffectiveConnectionTypeUnknown},
728 {flag_descriptions::kEffectiveConnectionTypeOfflineDescription, 728 {flag_descriptions::kEffectiveConnectionTypeOfflineDescription,
729 switches::kForceEffectiveConnectionType, 729 switches::kForceEffectiveConnectionType,
(...skipping 2370 matching lines...) Expand 10 before | Expand all | Expand 10 after
3100 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3100 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3101 3101
3102 const FeatureEntry* GetFeatureEntries(size_t* count) { 3102 const FeatureEntry* GetFeatureEntries(size_t* count) {
3103 *count = arraysize(kFeatureEntries); 3103 *count = arraysize(kFeatureEntries);
3104 return kFeatureEntries; 3104 return kFeatureEntries;
3105 } 3105 }
3106 3106
3107 } // namespace testing 3107 } // namespace testing
3108 3108
3109 } // namespace about_flags 3109 } // namespace about_flags
OLDNEW
« no previous file with comments | « android_webview/browser/aw_settings.cc ('k') | chrome/browser/android/voice_search_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698