| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 switches::kEnableZeroSuggestEtherSerp, ""}, | 321 switches::kEnableZeroSuggestEtherSerp, ""}, |
| 322 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, | 322 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, |
| 323 switches::kEnableZeroSuggestEtherNoSerp, ""}, | 323 switches::kEnableZeroSuggestEtherNoSerp, ""}, |
| 324 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 324 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 325 switches::kDisableZeroSuggest, ""} | 325 switches::kDisableZeroSuggest, ""} |
| 326 }; | 326 }; |
| 327 #endif | 327 #endif |
| 328 | 328 |
| 329 const Experiment::Choice kNumRasterThreadsChoices[] = { | 329 const Experiment::Choice kNumRasterThreadsChoices[] = { |
| 330 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 330 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 331 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, | 331 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, cc::switches::kNumRasterThreads, "1" }, |
| 332 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, | 332 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, cc::switches::kNumRasterThreads, "2" }, |
| 333 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, | 333 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, cc::switches::kNumRasterThreads, "3" }, |
| 334 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } | 334 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, cc::switches::kNumRasterThreads, "4" } |
| 335 }; | 335 }; |
| 336 | 336 |
| 337 // We're using independent flags here (as opposed to a common flag with | 337 // We're using independent flags here (as opposed to a common flag with |
| 338 // different values) to be able to enable/disable the entire experience | 338 // different values) to be able to enable/disable the entire experience |
| 339 // associated with this feature server-side from the FieldTrial (the complete | 339 // associated with this feature server-side from the FieldTrial (the complete |
| 340 // experience includes other flag changes as well). It is not currently possible | 340 // experience includes other flag changes as well). It is not currently possible |
| 341 // to do that with "flag=value" flags. | 341 // to do that with "flag=value" flags. |
| 342 const Experiment::Choice kSearchButtonInOmniboxChoices[] = { | 342 const Experiment::Choice kSearchButtonInOmniboxChoices[] = { |
| 343 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 343 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 344 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 344 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| (...skipping 2144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2489 } | 2489 } |
| 2490 | 2490 |
| 2491 const Experiment* GetExperiments(size_t* count) { | 2491 const Experiment* GetExperiments(size_t* count) { |
| 2492 *count = num_experiments; | 2492 *count = num_experiments; |
| 2493 return experiments; | 2493 return experiments; |
| 2494 } | 2494 } |
| 2495 | 2495 |
| 2496 } // namespace testing | 2496 } // namespace testing |
| 2497 | 2497 |
| 2498 } // namespace about_flags | 2498 } // namespace about_flags |
| OLD | NEW |