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