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 1717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1728 #endif // TOOLKIT_VIEWS || OS_ANDROID | 1728 #endif // TOOLKIT_VIEWS || OS_ANDROID |
1729 #if defined(OS_ANDROID) | 1729 #if defined(OS_ANDROID) |
1730 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, | 1730 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, |
1731 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, | 1731 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, |
1732 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, | 1732 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, |
1733 {"app-link", IDS_FLAGS_ENABLE_APP_LINK_NAME, | 1733 {"app-link", IDS_FLAGS_ENABLE_APP_LINK_NAME, |
1734 IDS_FLAGS_ENABLE_APP_LINK_DESCRIPTION, kOsAndroid, | 1734 IDS_FLAGS_ENABLE_APP_LINK_DESCRIPTION, kOsAndroid, |
1735 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppLink, | 1735 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppLink, |
1736 switches::kDisableAppLink)}, | 1736 switches::kDisableAppLink)}, |
1737 #endif // OS_ANDROID | 1737 #endif // OS_ANDROID |
| 1738 {"enable-md-bookmarks", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_NAME, |
| 1739 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_DESCRIPTION, kOsDesktop, |
| 1740 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, |
1738 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME, | 1741 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME, |
1739 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop, | 1742 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop, |
1740 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, | 1743 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, |
1741 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, | 1744 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, |
1742 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, | 1745 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, |
1743 FEATURE_VALUE_TYPE(features::kMaterialDesignHistory)}, | 1746 FEATURE_VALUE_TYPE(features::kMaterialDesignHistory)}, |
1744 {"enable-md-settings", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME, | 1747 {"enable-md-settings", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME, |
1745 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_DESCRIPTION, kOsDesktop, | 1748 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_DESCRIPTION, kOsDesktop, |
1746 FEATURE_VALUE_TYPE(features::kMaterialDesignSettings)}, | 1749 FEATURE_VALUE_TYPE(features::kMaterialDesignSettings)}, |
1747 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME, | 1750 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME, |
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2273 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2276 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2274 | 2277 |
2275 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2278 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2276 *count = arraysize(kFeatureEntries); | 2279 *count = arraysize(kFeatureEntries); |
2277 return kFeatureEntries; | 2280 return kFeatureEntries; |
2278 } | 2281 } |
2279 | 2282 |
2280 } // namespace testing | 2283 } // namespace testing |
2281 | 2284 |
2282 } // namespace about_flags | 2285 } // namespace about_flags |
OLD | NEW |