| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 // When adding a new choice, add it to the end of the list. | 529 // When adding a new choice, add it to the end of the list. |
| 530 const Experiment kExperiments[] = { | 530 const Experiment kExperiments[] = { |
| 531 { | 531 { |
| 532 "ignore-gpu-blacklist", | 532 "ignore-gpu-blacklist", |
| 533 IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, | 533 IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, |
| 534 IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, | 534 IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, |
| 535 kOsAll, | 535 kOsAll, |
| 536 SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist) | 536 SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist) |
| 537 }, | 537 }, |
| 538 { | 538 { |
| 539 "threaded-compositing-mode", | |
| 540 IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME, | |
| 541 IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, | |
| 542 #if !defined(USE_AURA) | |
| 543 kOsLinux, | |
| 544 #else | |
| 545 0, | |
| 546 #endif | |
| 547 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableThreadedCompositing, | |
| 548 switches::kDisableThreadedCompositing) | |
| 549 }, | |
| 550 { | |
| 551 "force-accelerated-composited-scrolling", | 539 "force-accelerated-composited-scrolling", |
| 552 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, | 540 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME, |
| 553 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION, | 541 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION, |
| 554 kOsAll, | 542 kOsAll, |
| 555 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAcceleratedOverflowScroll, | 543 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAcceleratedOverflowScroll, |
| 556 switches::kDisableAcceleratedOverflowScroll) | 544 switches::kDisableAcceleratedOverflowScroll) |
| 557 }, | 545 }, |
| 558 { | 546 { |
| 559 "disable_layer_squashing", | 547 "disable_layer_squashing", |
| 560 IDS_FLAGS_DISABLE_LAYER_SQUASHING_NAME, | 548 IDS_FLAGS_DISABLE_LAYER_SQUASHING_NAME, |
| (...skipping 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2487 } | 2475 } |
| 2488 | 2476 |
| 2489 const Experiment* GetExperiments(size_t* count) { | 2477 const Experiment* GetExperiments(size_t* count) { |
| 2490 *count = num_experiments; | 2478 *count = num_experiments; |
| 2491 return experiments; | 2479 return experiments; |
| 2492 } | 2480 } |
| 2493 | 2481 |
| 2494 } // namespace testing | 2482 } // namespace testing |
| 2495 | 2483 |
| 2496 } // namespace about_flags | 2484 } // namespace about_flags |
| OLD | NEW |