| 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 1660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1671 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_NAME, | 1671 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_NAME, |
| 1672 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_DESCRIPTION, kOsAndroid, | 1672 IDS_FLAGS_BACKGROUND_LOADER_FOR_DOWNLOADS_DESCRIPTION, kOsAndroid, |
| 1673 FEATURE_VALUE_TYPE(offline_pages::kBackgroundLoaderForDownloadsFeature)}, | 1673 FEATURE_VALUE_TYPE(offline_pages::kBackgroundLoaderForDownloadsFeature)}, |
| 1674 #endif // OS_ANDROID | 1674 #endif // OS_ANDROID |
| 1675 {"disallow-doc-written-script-loads", | 1675 {"disallow-doc-written-script-loads", |
| 1676 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, | 1676 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_NAME, |
| 1677 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, | 1677 IDS_FLAGS_DISALLOW_DOC_WRITTEN_SCRIPTS_UI_DESCRIPTION, kOsAll, |
| 1678 // NOTE: if we want to add additional experiment entries for other | 1678 // NOTE: if we want to add additional experiment entries for other |
| 1679 // features controlled by kBlinkSettings, we'll need to add logic to | 1679 // features controlled by kBlinkSettings, we'll need to add logic to |
| 1680 // merge the flag values. | 1680 // merge the flag values. |
| 1681 SINGLE_VALUE_TYPE_AND_VALUE( | 1681 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1682 switches::kBlinkSettings, | 1682 switches::kBlinkSettings, |
| 1683 "disallowFetchForDocWrittenScriptsInMainFrame=true")}, | 1683 "disallowFetchForDocWrittenScriptsInMainFrame=true", |
| 1684 switches::kBlinkSettings, |
| 1685 "disallowFetchForDocWrittenScriptsInMainFrame=false")}, |
| 1684 #if defined(OS_ANDROID) | 1686 #if defined(OS_ANDROID) |
| 1685 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, | 1687 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| 1686 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, | 1688 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, |
| 1687 ENABLE_DISABLE_VALUE_TYPE(ntp_tiles::switches::kEnableNTPPopularSites, | 1689 ENABLE_DISABLE_VALUE_TYPE(ntp_tiles::switches::kEnableNTPPopularSites, |
| 1688 ntp_tiles::switches::kDisableNTPPopularSites)}, | 1690 ntp_tiles::switches::kDisableNTPPopularSites)}, |
| 1689 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, | 1691 {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, |
| 1690 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, | 1692 IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, |
| 1691 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, | 1693 MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, |
| 1692 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, | 1694 {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| 1693 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, | 1695 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2268 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2267 | 2269 |
| 2268 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2270 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2269 *count = arraysize(kFeatureEntries); | 2271 *count = arraysize(kFeatureEntries); |
| 2270 return kFeatureEntries; | 2272 return kFeatureEntries; |
| 2271 } | 2273 } |
| 2272 | 2274 |
| 2273 } // namespace testing | 2275 } // namespace testing |
| 2274 | 2276 |
| 2275 } // namespace about_flags | 2277 } // namespace about_flags |
| OLD | NEW |