| 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 // When adding a new choice, add it to the end of the list. | 496 // When adding a new choice, add it to the end of the list. |
| 497 const Experiment kExperiments[] = { | 497 const Experiment kExperiments[] = { |
| 498 { | 498 { |
| 499 "ignore-gpu-blacklist", | 499 "ignore-gpu-blacklist", |
| 500 IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, | 500 IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, |
| 501 IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, | 501 IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, |
| 502 kOsAll, | 502 kOsAll, |
| 503 SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist) | 503 SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist) |
| 504 }, | 504 }, |
| 505 { | 505 { |
| 506 "threaded-compositing-mode", | |
| 507 IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME, | |
| 508 IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, | |
| 509 #if !defined(USE_AURA) | |
| 510 kOsLinux, | |
| 511 #else | |
| 512 0, | |
| 513 #endif | |
| 514 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableThreadedCompositing, | |
| 515 switches::kDisableThreadedCompositing) | |
| 516 }, | |
| 517 { | |
| 518 "force-accelerated-composited-scrolling", | 506 "force-accelerated-composited-scrolling", |
| 519 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, | 507 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, |
| 520 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION, | 508 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION, |
| 521 kOsAll, | 509 kOsAll, |
| 522 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAcceleratedOverflowScroll, | 510 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAcceleratedOverflowScroll, |
| 523 switches::kDisableAcceleratedOverflowScroll) | 511 switches::kDisableAcceleratedOverflowScroll) |
| 524 }, | 512 }, |
| 525 { | 513 { |
| 526 "force-universal-accelerated-composited-scrolling", | 514 "force-universal-accelerated-composited-scrolling", |
| 527 IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, | 515 IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, |
| (...skipping 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2459 } | 2447 } |
| 2460 | 2448 |
| 2461 const Experiment* GetExperiments(size_t* count) { | 2449 const Experiment* GetExperiments(size_t* count) { |
| 2462 *count = num_experiments; | 2450 *count = num_experiments; |
| 2463 return experiments; | 2451 return experiments; |
| 2464 } | 2452 } |
| 2465 | 2453 |
| 2466 } // namespace testing | 2454 } // namespace testing |
| 2467 | 2455 |
| 2468 } // namespace about_flags | 2456 } // namespace about_flags |
| OLD | NEW |