Chromium Code Reviews| 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 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1614 #endif // defined(TOOLKIT_VIEWS) | 1614 #endif // defined(TOOLKIT_VIEWS) |
| 1615 #if defined(OS_ANDROID) | 1615 #if defined(OS_ANDROID) |
| 1616 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, | 1616 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| 1617 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, | 1617 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
| 1618 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, | 1618 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
| 1619 #endif // defined(OS_ANDROID) | 1619 #endif // defined(OS_ANDROID) |
| 1620 #if defined(OS_ANDROID) | 1620 #if defined(OS_ANDROID) |
| 1621 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, | 1621 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, |
| 1622 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, | 1622 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, |
| 1623 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, | 1623 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, |
| 1624 {"offline-pages-backgorund_loading_mode", | |
|
jianli
2016/03/12 00:08:30
nit: replace "_" with '-". Also you can drop "mode
Pete Williamson
2016/03/12 00:48:29
Done.
| |
| 1625 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_NAME, | |
| 1626 IDS_FLAGS_OFFLINE_PAGES_BACKGROUND_LOADING_DESCRIPTION, kOsAndroid, | |
| 1627 FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesBackgroundLoadingFeature)}, | |
| 1624 #endif // defined(OS_ANDROID) | 1628 #endif // defined(OS_ANDROID) |
| 1625 {"low-priority-iframes", IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, | 1629 {"low-priority-iframes", IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, |
| 1626 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, kOsAll, | 1630 IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, kOsAll, |
| 1627 // NOTE: if we want to add additional experiment entries for other | 1631 // NOTE: if we want to add additional experiment entries for other |
| 1628 // features controlled by kBlinkSettings, we'll need to add logic to | 1632 // features controlled by kBlinkSettings, we'll need to add logic to |
| 1629 // merge the flag values. | 1633 // merge the flag values. |
| 1630 SINGLE_VALUE_TYPE_AND_VALUE(switches::kBlinkSettings, | 1634 SINGLE_VALUE_TYPE_AND_VALUE(switches::kBlinkSettings, |
| 1631 "lowPriorityIframes=true")}, | 1635 "lowPriorityIframes=true")}, |
| 1632 #if defined(OS_ANDROID) | 1636 #if defined(OS_ANDROID) |
| 1633 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, | 1637 {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2019 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2023 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2020 | 2024 |
| 2021 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2025 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2022 *count = arraysize(kFeatureEntries); | 2026 *count = arraysize(kFeatureEntries); |
| 2023 return kFeatureEntries; | 2027 return kFeatureEntries; |
| 2024 } | 2028 } |
| 2025 | 2029 |
| 2026 } // namespace testing | 2030 } // namespace testing |
| 2027 | 2031 |
| 2028 } // namespace about_flags | 2032 } // namespace about_flags |
| OLD | NEW |