| 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 2804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2815 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, | 2815 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, |
| 2816 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, | 2816 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, |
| 2817 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, | 2817 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, |
| 2818 | 2818 |
| 2819 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ | 2819 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ |
| 2820 defined(OS_WIN) | 2820 defined(OS_WIN) |
| 2821 {"omnibox-entity-suggestions", | 2821 {"omnibox-entity-suggestions", |
| 2822 flag_descriptions::kOmniboxEntitySuggestionsName, | 2822 flag_descriptions::kOmniboxEntitySuggestionsName, |
| 2823 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, | 2823 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, |
| 2824 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, | 2824 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, |
| 2825 {"omnibox-tail-suggestions", flag_descriptions::kOmniboxTailSuggestionsName, |
| 2826 flag_descriptions::kOmniboxTailSuggestionsDescription, kOsDesktop, |
| 2827 FEATURE_VALUE_TYPE(omnibox::kOmniboxTailSuggestions)}, |
| 2825 {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, | 2828 {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, |
| 2826 flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, | 2829 flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, |
| 2827 SINGLE_VALUE_TYPE(switches::kEnableNewAppMenuIcon)}, | 2830 SINGLE_VALUE_TYPE(switches::kEnableNewAppMenuIcon)}, |
| 2828 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || | 2831 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || |
| 2829 // defined(OS_WIN) | 2832 // defined(OS_WIN) |
| 2830 | 2833 |
| 2831 #if defined(OS_ANDROID) | 2834 #if defined(OS_ANDROID) |
| 2832 {"enable-custom-feedback-ui", | 2835 {"enable-custom-feedback-ui", |
| 2833 flag_descriptions::kEnableCustomFeedbackUiName, | 2836 flag_descriptions::kEnableCustomFeedbackUiName, |
| 2834 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid, | 2837 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid, |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3266 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3269 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 3267 | 3270 |
| 3268 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3271 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 3269 *count = arraysize(kFeatureEntries); | 3272 *count = arraysize(kFeatureEntries); |
| 3270 return kFeatureEntries; | 3273 return kFeatureEntries; |
| 3271 } | 3274 } |
| 3272 | 3275 |
| 3273 } // namespace testing | 3276 } // namespace testing |
| 3274 | 3277 |
| 3275 } // namespace about_flags | 3278 } // namespace about_flags |
| OLD | NEW |