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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
141 }; | 141 }; |
142 | 142 |
143 const Experiment::Choice kPointerLockUIChoices[] = { | 143 const Experiment::Choice kPointerLockUIChoices[] = { |
144 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 144 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
145 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 145 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
146 switches::kEnablePointerLock, ""}, | 146 switches::kEnablePointerLock, ""}, |
147 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 147 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
148 switches::kDisablePointerLock, ""} | 148 switches::kDisablePointerLock, ""} |
149 }; | 149 }; |
150 | 150 |
151 const Experiment::Choice kAsyncDnsChoices[] = { | |
152 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
153 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
154 switches::kDisableAsyncDns, ""}, | |
155 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
156 switches::kEnableAsyncDns, ""} | |
157 }; | |
158 | |
151 | 159 |
152 // RECORDING USER METRICS FOR FLAGS: | 160 // RECORDING USER METRICS FOR FLAGS: |
153 // ----------------------------------------------------------------------------- | 161 // ----------------------------------------------------------------------------- |
154 // The first line of the experiment is the internal name. If you'd like to | 162 // The first line of the experiment is the internal name. If you'd like to |
155 // gather statistics about the usage of your flag, you should append a marker | 163 // gather statistics about the usage of your flag, you should append a marker |
156 // comment to the end of the feature name, like so: | 164 // comment to the end of the feature name, like so: |
157 // "my-special-feature", // FLAGS:RECORD_UMA | 165 // "my-special-feature", // FLAGS:RECORD_UMA |
158 // | 166 // |
159 // After doing that, run //chrome/tools/extract_actions.py (see instructions at | 167 // After doing that, run //chrome/tools/extract_actions.py (see instructions at |
160 // the top of that file for details) to update the chromeactions.txt file, which | 168 // the top of that file for details) to update the chromeactions.txt file, which |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
513 "enable-spdy3", | 521 "enable-spdy3", |
514 IDS_FLAGS_ENABLE_SPDY3_NAME, | 522 IDS_FLAGS_ENABLE_SPDY3_NAME, |
515 IDS_FLAGS_ENABLE_SPDY3_DESCRIPTION, | 523 IDS_FLAGS_ENABLE_SPDY3_DESCRIPTION, |
516 kOsAll, | 524 kOsAll, |
517 SINGLE_VALUE_TYPE(switches::kEnableSpdy3) | 525 SINGLE_VALUE_TYPE(switches::kEnableSpdy3) |
518 }, | 526 }, |
519 { | 527 { |
520 "enable-async-dns", | 528 "enable-async-dns", |
521 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, | 529 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, |
522 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, | 530 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, |
523 kOsWin | kOsMac | kOsLinux | kOsCrOS, | 531 kOsWin | kOsMac | kOsLinux | kOsCrOS, |
cbentzel
2012/08/20 11:45:56
Should you remove kOsCros at this point? I thought
szym
2012/08/20 17:54:21
There are, but I'm currently working on the merger
cbentzel
2012/08/21 10:50:53
Yeah, disable for now especially since this change
| |
524 SINGLE_VALUE_TYPE(switches::kEnableAsyncDns) | 532 MULTI_VALUE_TYPE(kAsyncDnsChoices) |
525 }, | 533 }, |
526 { | 534 { |
527 "enable-video-track", | 535 "enable-video-track", |
528 IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME, | 536 IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME, |
529 IDS_FLAGS_ENABLE_VIDEO_TRACK_DESCRIPTION, | 537 IDS_FLAGS_ENABLE_VIDEO_TRACK_DESCRIPTION, |
530 kOsAll, | 538 kOsAll, |
531 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) | 539 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) |
532 }, | 540 }, |
533 { | 541 { |
534 "enable-media-source", | 542 "enable-media-source", |
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1341 } | 1349 } |
1342 | 1350 |
1343 const Experiment* GetExperiments(size_t* count) { | 1351 const Experiment* GetExperiments(size_t* count) { |
1344 *count = num_experiments; | 1352 *count = num_experiments; |
1345 return experiments; | 1353 return experiments; |
1346 } | 1354 } |
1347 | 1355 |
1348 } // namespace testing | 1356 } // namespace testing |
1349 | 1357 |
1350 } // namespace about_flags | 1358 } // namespace about_flags |
OLD | NEW |