| 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 1861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1872 #endif | 1872 #endif |
| 1873 #if defined(ENABLE_EXTENSIONS) | 1873 #if defined(ENABLE_EXTENSIONS) |
| 1874 { | 1874 { |
| 1875 "extension-active-script-permission", | 1875 "extension-active-script-permission", |
| 1876 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, | 1876 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
| 1877 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, | 1877 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, |
| 1878 kOsAll, | 1878 kOsAll, |
| 1879 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction) | 1879 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction) |
| 1880 }, | 1880 }, |
| 1881 #endif | 1881 #endif |
| 1882 { | |
| 1883 "harfbuzz-rendertext", | |
| 1884 IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, | |
| 1885 IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, | |
| 1886 kOsDesktop, | |
| 1887 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText, | |
| 1888 switches::kDisableHarfBuzzRenderText) | |
| 1889 }, | |
| 1890 #if defined(OS_ANDROID) | 1882 #if defined(OS_ANDROID) |
| 1891 { | 1883 { |
| 1892 "answers-in-suggest", | 1884 "answers-in-suggest", |
| 1893 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, | 1885 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, |
| 1894 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, | 1886 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, |
| 1895 kOsAndroid, | 1887 kOsAndroid, |
| 1896 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAnswersInSuggest, | 1888 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAnswersInSuggest, |
| 1897 switches::kDisableAnswersInSuggest) | 1889 switches::kDisableAnswersInSuggest) |
| 1898 }, | 1890 }, |
| 1899 #endif | 1891 #endif |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2145 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) | 2137 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) |
| 2146 }, | 2138 }, |
| 2147 | 2139 |
| 2148 { | 2140 { |
| 2149 "enable-site-per-process", | 2141 "enable-site-per-process", |
| 2150 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME, | 2142 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME, |
| 2151 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION, | 2143 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION, |
| 2152 kOsAll, | 2144 kOsAll, |
| 2153 SINGLE_VALUE_TYPE(switches::kSitePerProcess) | 2145 SINGLE_VALUE_TYPE(switches::kSitePerProcess) |
| 2154 }, | 2146 }, |
| 2147 #if defined(OS_MACOSX) |
| 2148 { |
| 2149 "enable-harfbuzz-rendertext", |
| 2150 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, |
| 2151 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
| 2152 kOsMac, |
| 2153 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) |
| 2154 }, |
| 2155 #endif // defined(OS_MACOSX) |
| 2155 #if defined(OS_CHROMEOS) | 2156 #if defined(OS_CHROMEOS) |
| 2156 { | 2157 { |
| 2157 "enable-timezone-tracking", | 2158 "enable-timezone-tracking", |
| 2158 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 2159 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
| 2159 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 2160 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
| 2160 kOsCrOS, | 2161 kOsCrOS, |
| 2161 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) | 2162 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) |
| 2162 }, | 2163 }, |
| 2163 #endif // defined(OS_CHROMEOS) | 2164 #endif // defined(OS_CHROMEOS) |
| 2164 | 2165 |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2733 } | 2734 } |
| 2734 | 2735 |
| 2735 const Experiment* GetExperiments(size_t* count) { | 2736 const Experiment* GetExperiments(size_t* count) { |
| 2736 *count = num_experiments; | 2737 *count = num_experiments; |
| 2737 return experiments; | 2738 return experiments; |
| 2738 } | 2739 } |
| 2739 | 2740 |
| 2740 } // namespace testing | 2741 } // namespace testing |
| 2741 | 2742 |
| 2742 } // namespace about_flags | 2743 } // namespace about_flags |
| OLD | NEW |