| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "components/dom_distiller/core/dom_distiller_switches.h" | 43 #include "components/dom_distiller/core/dom_distiller_switches.h" |
| 44 #include "components/error_page/common/error_page_switches.h" | 44 #include "components/error_page/common/error_page_switches.h" |
| 45 #include "components/flags_ui/feature_entry_macros.h" | 45 #include "components/flags_ui/feature_entry_macros.h" |
| 46 #include "components/flags_ui/flags_storage.h" | 46 #include "components/flags_ui/flags_storage.h" |
| 47 #include "components/flags_ui/flags_ui_switches.h" | 47 #include "components/flags_ui/flags_ui_switches.h" |
| 48 #include "components/nacl/common/nacl_switches.h" | 48 #include "components/nacl/common/nacl_switches.h" |
| 49 #include "components/ntp_snippets/features.h" | 49 #include "components/ntp_snippets/features.h" |
| 50 #include "components/ntp_snippets/ntp_snippets_constants.h" | 50 #include "components/ntp_snippets/ntp_snippets_constants.h" |
| 51 #include "components/ntp_tiles/switches.h" | 51 #include "components/ntp_tiles/switches.h" |
| 52 #include "components/offline_pages/core/offline_page_feature.h" | 52 #include "components/offline_pages/core/offline_page_feature.h" |
| 53 #include "components/omnibox/browser/features.h" | |
| 54 #include "components/omnibox/browser/omnibox_field_trial.h" | 53 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 55 #include "components/omnibox/browser/omnibox_switches.h" | 54 #include "components/omnibox/browser/omnibox_switches.h" |
| 56 #include "components/password_manager/core/common/password_manager_features.h" | 55 #include "components/password_manager/core/common/password_manager_features.h" |
| 57 #include "components/proximity_auth/switches.h" | 56 #include "components/proximity_auth/switches.h" |
| 58 #include "components/security_state/core/security_state.h" | 57 #include "components/security_state/core/security_state.h" |
| 59 #include "components/security_state/core/switches.h" | 58 #include "components/security_state/core/switches.h" |
| 60 #include "components/signin/core/common/signin_switches.h" | 59 #include "components/signin/core/common/signin_switches.h" |
| 61 #include "components/spellcheck/common/spellcheck_features.h" | 60 #include "components/spellcheck/common/spellcheck_features.h" |
| 62 #include "components/spellcheck/common/spellcheck_switches.h" | 61 #include "components/spellcheck/common/spellcheck_switches.h" |
| 63 #include "components/spellcheck/spellcheck_build_features.h" | 62 #include "components/spellcheck/spellcheck_build_features.h" |
| (...skipping 2238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2302 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, | 2301 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, |
| 2303 {"ash-adjustable-large-cursor", | 2302 {"ash-adjustable-large-cursor", |
| 2304 IDS_FLAGS_ENABLE_ADJUSTABLE_LARGE_CURSOR_NAME, | 2303 IDS_FLAGS_ENABLE_ADJUSTABLE_LARGE_CURSOR_NAME, |
| 2305 IDS_FLAGS_ENABLE_ADJUSTABLE_LARGE_CURSOR_DESCRIPTION, kOsCrOS, | 2304 IDS_FLAGS_ENABLE_ADJUSTABLE_LARGE_CURSOR_DESCRIPTION, kOsCrOS, |
| 2306 SINGLE_VALUE_TYPE(ash::switches::kAshAdjustableLargeCursor)}, | 2305 SINGLE_VALUE_TYPE(ash::switches::kAshAdjustableLargeCursor)}, |
| 2307 #endif // OS_CHROMEOS | 2306 #endif // OS_CHROMEOS |
| 2308 | 2307 |
| 2309 {"enable-zero-suggest-redirect-to-chrome", | 2308 {"enable-zero-suggest-redirect-to-chrome", |
| 2310 IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_NAME, | 2309 IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_NAME, |
| 2311 IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_DESCRIPTION, kOsDesktop, | 2310 IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_DESCRIPTION, kOsDesktop, |
| 2312 FEATURE_VALUE_TYPE(features::kZeroSuggestRedirectToChrome)}, | 2311 FEATURE_VALUE_TYPE(omnibox::kZeroSuggestRedirectToChrome)}, |
| 2313 {"new-omnibox-answer-types", IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_NAME, | 2312 {"new-omnibox-answer-types", IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_NAME, |
| 2314 IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_DESCRIPTION, kOsAll, | 2313 IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_DESCRIPTION, kOsAll, |
| 2315 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, | 2314 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, |
| 2316 | 2315 |
| 2317 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ | 2316 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ |
| 2318 defined(OS_WIN) | 2317 defined(OS_WIN) |
| 2319 {"omnibox-entity-suggestions", IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_NAME, | 2318 {"omnibox-entity-suggestions", IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_NAME, |
| 2320 IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_DESCRIPTION, kOsDesktop, | 2319 IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_DESCRIPTION, kOsDesktop, |
| 2321 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, | 2320 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, |
| 2322 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || | 2321 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2529 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2528 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2530 | 2529 |
| 2531 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2530 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2532 *count = arraysize(kFeatureEntries); | 2531 *count = arraysize(kFeatureEntries); |
| 2533 return kFeatureEntries; | 2532 return kFeatureEntries; |
| 2534 } | 2533 } |
| 2535 | 2534 |
| 2536 } // namespace testing | 2535 } // namespace testing |
| 2537 | 2536 |
| 2538 } // namespace about_flags | 2537 } // namespace about_flags |
| OLD | NEW |