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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none" }, | 545 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none" }, |
546 { IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse" }, | 546 { IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse" }, |
547 { IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code" }, | 547 { IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code" }, |
548 }; | 548 }; |
549 | 549 |
550 #if defined(OS_ANDROID) | 550 #if defined(OS_ANDROID) |
551 const Experiment::Choice kProgressBarAnimationChoices[] = { | 551 const Experiment::Choice kProgressBarAnimationChoices[] = { |
552 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 552 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
553 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 553 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
554 switches::kProgressBarAnimation, "disabled" }, | 554 switches::kProgressBarAnimation, "disabled" }, |
| 555 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR, |
| 556 switches::kProgressBarAnimation, "linear" }, |
555 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, | 557 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, |
556 switches::kProgressBarAnimation, "smooth" }, | 558 switches::kProgressBarAnimation, "smooth" }, |
557 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, | 559 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, |
558 switches::kProgressBarAnimation, "fast-start" }, | 560 switches::kProgressBarAnimation, "fast-start" }, |
559 }; | 561 }; |
560 #endif // defined(OS_ANDROID) | 562 #endif // defined(OS_ANDROID) |
561 | 563 |
562 // RECORDING USER METRICS FOR FLAGS: | 564 // RECORDING USER METRICS FOR FLAGS: |
563 // ----------------------------------------------------------------------------- | 565 // ----------------------------------------------------------------------------- |
564 // The first line of the experiment is the internal name. If you'd like to | 566 // The first line of the experiment is the internal name. If you'd like to |
(...skipping 2170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2735 } | 2737 } |
2736 | 2738 |
2737 const Experiment* GetExperiments(size_t* count) { | 2739 const Experiment* GetExperiments(size_t* count) { |
2738 *count = num_experiments; | 2740 *count = num_experiments; |
2739 return experiments; | 2741 return experiments; |
2740 } | 2742 } |
2741 | 2743 |
2742 } // namespace testing | 2744 } // namespace testing |
2743 | 2745 |
2744 } // namespace about_flags | 2746 } // namespace about_flags |
OLD | NEW |