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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 switches::reader_mode_heuristics::kAdaBoost }, | 278 switches::reader_mode_heuristics::kAdaBoost }, |
279 { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_ON, | 279 { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_ON, |
280 switches::kReaderModeHeuristics, | 280 switches::kReaderModeHeuristics, |
281 switches::reader_mode_heuristics::kAlwaysTrue }, | 281 switches::reader_mode_heuristics::kAlwaysTrue }, |
282 { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_OFF, | 282 { IDS_FLAGS_READER_MODE_HEURISTICS_ALWAYS_OFF, |
283 switches::kReaderModeHeuristics, | 283 switches::kReaderModeHeuristics, |
284 switches::reader_mode_heuristics::kNone }, | 284 switches::reader_mode_heuristics::kNone }, |
285 }; | 285 }; |
286 #endif | 286 #endif |
287 | 287 |
288 const FeatureEntry::Choice kNumRasterThreadsChoices[] = { | 288 const FeatureEntry::Choice kNumCategorizedWorkerThreadsChoices[] = { |
289 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 289 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
290 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, | 290 {IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_ONE, |
291 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, | 291 switches::kNumCategorizedWorkerThreads, "1"}, |
292 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, | 292 {IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_TWO, |
293 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } | 293 switches::kNumCategorizedWorkerThreads, "2"}, |
294 }; | 294 {IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_THREE, |
| 295 switches::kNumCategorizedWorkerThreads, "3"}, |
| 296 {IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_FOUR, |
| 297 switches::kNumCategorizedWorkerThreads, "4"}}; |
295 | 298 |
296 const FeatureEntry::Choice kGpuRasterizationMSAASampleCountChoices[] = { | 299 const FeatureEntry::Choice kGpuRasterizationMSAASampleCountChoices[] = { |
297 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, | 300 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, |
298 "", | 301 "", |
299 "" }, | 302 "" }, |
300 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_ZERO, | 303 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_ZERO, |
301 switches::kGpuRasterizationMSAASampleCount, "0" }, | 304 switches::kGpuRasterizationMSAASampleCount, "0" }, |
302 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_TWO, | 305 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_TWO, |
303 switches::kGpuRasterizationMSAASampleCount, "2" }, | 306 switches::kGpuRasterizationMSAASampleCount, "2" }, |
304 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_FOUR, | 307 { IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_FOUR, |
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 #if defined(ENABLE_EXTENSIONS) | 1271 #if defined(ENABLE_EXTENSIONS) |
1269 {"enable-apps-show-on-first-paint", IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME, | 1272 {"enable-apps-show-on-first-paint", IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME, |
1270 IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, kOsDesktop, | 1273 IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, kOsDesktop, |
1271 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)}, | 1274 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)}, |
1272 #endif | 1275 #endif |
1273 #if defined(OS_ANDROID) | 1276 #if defined(OS_ANDROID) |
1274 {"reader-mode-heuristics", IDS_FLAGS_READER_MODE_HEURISTICS_NAME, | 1277 {"reader-mode-heuristics", IDS_FLAGS_READER_MODE_HEURISTICS_NAME, |
1275 IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid, | 1278 IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid, |
1276 MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, | 1279 MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, |
1277 #endif | 1280 #endif |
1278 {"num-raster-threads", IDS_FLAGS_NUM_RASTER_THREADS_NAME, | 1281 {"num-categorized-worker-threads", |
1279 IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, kOsAll, | 1282 IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_NAME, |
1280 MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, | 1283 IDS_FLAGS_NUM_CATEGORIZED_WORKER_THREADS_DESCRIPTION, kOsAll, |
| 1284 MULTI_VALUE_TYPE(kNumCategorizedWorkerThreadsChoices)}, |
1281 {"enable-permission-action-reporting", | 1285 {"enable-permission-action-reporting", |
1282 IDS_FLAGS_PERMISSION_ACTION_REPORTING_NAME, | 1286 IDS_FLAGS_PERMISSION_ACTION_REPORTING_NAME, |
1283 IDS_FLAGS_PERMISSION_ACTION_REPORTING_DESCRIPTION, kOsAll, | 1287 IDS_FLAGS_PERMISSION_ACTION_REPORTING_DESCRIPTION, kOsAll, |
1284 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionActionReporting, | 1288 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionActionReporting, |
1285 switches::kDisablePermissionActionReporting)}, | 1289 switches::kDisablePermissionActionReporting)}, |
1286 {"enable-permissions-blacklist", IDS_FLAGS_PERMISSIONS_BLACKLIST_NAME, | 1290 {"enable-permissions-blacklist", IDS_FLAGS_PERMISSIONS_BLACKLIST_NAME, |
1287 IDS_FLAGS_PERMISSIONS_BLACKLIST_DESCRIPTION, kOsAll, | 1291 IDS_FLAGS_PERMISSIONS_BLACKLIST_DESCRIPTION, kOsAll, |
1288 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBlacklist, | 1292 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBlacklist, |
1289 switches::kDisablePermissionsBlacklist)}, | 1293 switches::kDisablePermissionsBlacklist)}, |
1290 {"enable-single-click-autofill", IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME, | 1294 {"enable-single-click-autofill", IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME, |
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2098 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2102 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2099 | 2103 |
2100 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2104 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2101 *count = arraysize(kFeatureEntries); | 2105 *count = arraysize(kFeatureEntries); |
2102 return kFeatureEntries; | 2106 return kFeatureEntries; |
2103 } | 2107 } |
2104 | 2108 |
2105 } // namespace testing | 2109 } // namespace testing |
2106 | 2110 |
2107 } // namespace about_flags | 2111 } // namespace about_flags |
OLD | NEW |