| 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 2604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2615 {"enable-touch-support-for-screen-magnifier", | 2615 {"enable-touch-support-for-screen-magnifier", |
| 2616 flag_descriptions::kEnableTouchSupportForScreenMagnifierName, | 2616 flag_descriptions::kEnableTouchSupportForScreenMagnifierName, |
| 2617 flag_descriptions::kEnableTouchSupportForScreenMagnifierDescription, | 2617 flag_descriptions::kEnableTouchSupportForScreenMagnifierDescription, |
| 2618 kOsCrOS, | 2618 kOsCrOS, |
| 2619 SINGLE_VALUE_TYPE( | 2619 SINGLE_VALUE_TYPE( |
| 2620 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, | 2620 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, |
| 2621 #endif // OS_CHROMEOS | 2621 #endif // OS_CHROMEOS |
| 2622 | 2622 |
| 2623 {"enable-zero-suggest-redirect-to-chrome", | 2623 {"enable-zero-suggest-redirect-to-chrome", |
| 2624 flag_descriptions::kEnableZeroSuggestRedirectToChromeName, | 2624 flag_descriptions::kEnableZeroSuggestRedirectToChromeName, |
| 2625 flag_descriptions::kEnableZeroSuggestRedirectToChromeDescription, | 2625 flag_descriptions::kEnableZeroSuggestRedirectToChromeDescription, kOsAll, |
| 2626 kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kZeroSuggestRedirectToChrome)}, | 2626 FEATURE_VALUE_TYPE(omnibox::kZeroSuggestRedirectToChrome)}, |
| 2627 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, | 2627 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, |
| 2628 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, | 2628 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, |
| 2629 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, | 2629 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, |
| 2630 | 2630 |
| 2631 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ | 2631 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ |
| 2632 defined(OS_WIN) | 2632 defined(OS_WIN) |
| 2633 {"omnibox-entity-suggestions", | 2633 {"omnibox-entity-suggestions", |
| 2634 flag_descriptions::kOmniboxEntitySuggestionsName, | 2634 flag_descriptions::kOmniboxEntitySuggestionsName, |
| 2635 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, | 2635 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, |
| 2636 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, | 2636 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2983 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2983 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2984 | 2984 |
| 2985 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2985 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2986 *count = arraysize(kFeatureEntries); | 2986 *count = arraysize(kFeatureEntries); |
| 2987 return kFeatureEntries; | 2987 return kFeatureEntries; |
| 2988 } | 2988 } |
| 2989 | 2989 |
| 2990 } // namespace testing | 2990 } // namespace testing |
| 2991 | 2991 |
| 2992 } // namespace about_flags | 2992 } // namespace about_flags |
| OLD | NEW |