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 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
517 switches::kSupervisedUserSafeSites, | 517 switches::kSupervisedUserSafeSites, |
518 "disabled" }, | 518 "disabled" }, |
519 { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY, | 519 { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY, |
520 switches::kSupervisedUserSafeSites, | 520 switches::kSupervisedUserSafeSites, |
521 "blacklist-only" }, | 521 "blacklist-only" }, |
522 { IDS_SUPERVISED_USER_SAFESITES_ONLINE_CHECK_ONLY, | 522 { IDS_SUPERVISED_USER_SAFESITES_ONLINE_CHECK_ONLY, |
523 switches::kSupervisedUserSafeSites, | 523 switches::kSupervisedUserSafeSites, |
524 "online-check-only" } | 524 "online-check-only" } |
525 }; | 525 }; |
526 | 526 |
| 527 const Experiment::Choice kV8PacChoices[] = { |
| 528 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 529 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 530 switches::kV8PacMojoOutOfProcess, |
| 531 "enabled" }, |
| 532 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 533 switches::kDisableOutOfProcessPac, |
| 534 "disabled" } |
| 535 }; |
| 536 |
527 // RECORDING USER METRICS FOR FLAGS: | 537 // RECORDING USER METRICS FOR FLAGS: |
528 // ----------------------------------------------------------------------------- | 538 // ----------------------------------------------------------------------------- |
529 // The first line of the experiment is the internal name. If you'd like to | 539 // The first line of the experiment is the internal name. If you'd like to |
530 // gather statistics about the usage of your flag, you should append a marker | 540 // gather statistics about the usage of your flag, you should append a marker |
531 // comment to the end of the feature name, like so: | 541 // comment to the end of the feature name, like so: |
532 // "my-special-feature", // FLAGS:RECORD_UMA | 542 // "my-special-feature", // FLAGS:RECORD_UMA |
533 // | 543 // |
534 // After doing that, run | 544 // After doing that, run |
535 // tools/metrics/actions/extract_actions.py | 545 // tools/metrics/actions/extract_actions.py |
536 // to add the metric to actions.xml (which will enable UMA to record your | 546 // to add the metric to actions.xml (which will enable UMA to record your |
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2386 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION, | 2396 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION, |
2387 kOsCrOS, | 2397 kOsCrOS, |
2388 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport) | 2398 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport) |
2389 }, | 2399 }, |
2390 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE) | 2400 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE) |
2391 { | 2401 { |
2392 "v8-pac-mojo-out-of-process", | 2402 "v8-pac-mojo-out-of-process", |
2393 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, | 2403 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, |
2394 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, | 2404 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, |
2395 kOsDesktop, | 2405 kOsDesktop, |
2396 SINGLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess), | 2406 MULTI_VALUE_TYPE(kV8PacChoices), |
2397 }, | 2407 }, |
2398 #if defined(OS_CHROMEOS) | 2408 #if defined(OS_CHROMEOS) |
2399 { | 2409 { |
2400 "enable-firewall-hole-punching", | 2410 "enable-firewall-hole-punching", |
2401 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME, | 2411 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME, |
2402 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION, | 2412 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION, |
2403 kOsCrOS, | 2413 kOsCrOS, |
2404 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching) | 2414 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching) |
2405 }, | 2415 }, |
2406 #endif // defined(OS_CHROMEOS) | 2416 #endif // defined(OS_CHROMEOS) |
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3057 } | 3067 } |
3058 | 3068 |
3059 const Experiment* GetExperiments(size_t* count) { | 3069 const Experiment* GetExperiments(size_t* count) { |
3060 *count = num_experiments; | 3070 *count = num_experiments; |
3061 return experiments; | 3071 return experiments; |
3062 } | 3072 } |
3063 | 3073 |
3064 } // namespace testing | 3074 } // namespace testing |
3065 | 3075 |
3066 } // namespace about_flags | 3076 } // namespace about_flags |
OLD | NEW |