| 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 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1580 #endif // defined(OS_ANDROID) | 1580 #endif // defined(OS_ANDROID) |
| 1581 #if defined(OS_ANDROID) | 1581 #if defined(OS_ANDROID) |
| 1582 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, | 1582 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, |
| 1583 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, | 1583 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, |
| 1584 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, | 1584 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, |
| 1585 {"offline-pages-background-loading", | 1585 {"offline-pages-background-loading", |
| 1586 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, | 1586 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, |
| 1587 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, | 1587 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, |
| 1588 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, | 1588 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, |
| 1589 #endif // defined(OS_ANDROID) | 1589 #endif // defined(OS_ANDROID) |
| 1590 {"low-priority-iframes", IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, | 1590 {"disallow-doc-written-script-loads", |
| 1591 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, kOsAll, | 1591 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, |
| 1592 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, |
| 1592 // NOTE: if we want to add additional experiment entries for other | 1593 // NOTE: if we want to add additional experiment entries for other |
| 1593 // features controlled by kBlinkSettings, we'll need to add logic to | 1594 // features controlled by kBlinkSettings, we'll need to add logic to |
| 1594 // merge the flag values. | 1595 // merge the flag values. |
| 1595 SINGLE_VALUE_TYPE_AND_VALUE(switches::kBlinkSettings, | 1596 SINGLE_VALUE_TYPE_AND_VALUE( |
| 1596 "lowPriorityIframes=true")}, | 1597 switches::kBlinkSettings, |
| 1598 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, |
| 1597 #if defined(OS_ANDROID) | 1599 #if defined(OS_ANDROID) |
| 1598 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, | 1600 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| 1599 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, | 1601 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, |
| 1600 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, | 1602 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
| 1601 switches::kDisableNTPPopularSites)}, | 1603 switches::kDisableNTPPopularSites)}, |
| 1602 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, | 1604 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, |
| 1603 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, | 1605 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, |
| 1604 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, | 1606 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, |
| 1605 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, | 1607 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| 1606 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, | 1608 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2006 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2008 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2007 | 2009 |
| 2008 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2010 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2009 *count = arraysize(kFeatureEntries); | 2011 *count = arraysize(kFeatureEntries); |
| 2010 return kFeatureEntries; | 2012 return kFeatureEntries; |
| 2011 } | 2013 } |
| 2012 | 2014 |
| 2013 } // namespace testing | 2015 } // namespace testing |
| 2014 | 2016 |
| 2015 } // namespace about_flags | 2017 } // namespace about_flags |
| OLD | NEW |