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 1804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1815 password_manager::features::kProtectSyncCredentialOnReauth)}, | 1815 password_manager::features::kProtectSyncCredentialOnReauth)}, |
1816 #if defined(OS_CHROMEOS) | 1816 #if defined(OS_CHROMEOS) |
1817 {"enable-experimental-accessibility-features", | 1817 {"enable-experimental-accessibility-features", |
1818 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, | 1818 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, |
1819 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, | 1819 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, |
1820 SINGLE_VALUE_TYPE( | 1820 SINGLE_VALUE_TYPE( |
1821 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, | 1821 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, |
1822 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, | 1822 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, |
1823 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, | 1823 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, |
1824 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, | 1824 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, |
| 1825 {"enable-system-timezone-automatic-detection", |
| 1826 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_NAME, |
| 1827 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS, |
| 1828 SINGLE_VALUE_TYPE( |
| 1829 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)}, |
1825 #endif | 1830 #endif |
1826 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) | 1831 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) |
1827 {"enable-google-branded-context-menu", | 1832 {"enable-google-branded-context-menu", |
1828 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, | 1833 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, |
1829 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, | 1834 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, |
1830 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, | 1835 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, |
1831 #endif | 1836 #endif |
1832 // NOTE: Adding new command-line switches requires adding corresponding | 1837 // NOTE: Adding new command-line switches requires adding corresponding |
1833 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1838 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1834 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1839 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2021 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2026 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2022 | 2027 |
2023 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2028 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2024 *count = arraysize(kFeatureEntries); | 2029 *count = arraysize(kFeatureEntries); |
2025 return kFeatureEntries; | 2030 return kFeatureEntries; |
2026 } | 2031 } |
2027 | 2032 |
2028 } // namespace testing | 2033 } // namespace testing |
2029 | 2034 |
2030 } // namespace about_flags | 2035 } // namespace about_flags |
OLD | NEW |