| 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) | 521 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) |
| 522 }, | 522 }, |
| 523 { | 523 { |
| 524 "nacl-debug-mask", // FLAGS:RECORD_UMA | 524 "nacl-debug-mask", // FLAGS:RECORD_UMA |
| 525 IDS_FLAGS_NACL_DEBUG_MASK_NAME, | 525 IDS_FLAGS_NACL_DEBUG_MASK_NAME, |
| 526 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 526 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
| 527 kOsDesktop, | 527 kOsDesktop, |
| 528 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) | 528 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) |
| 529 }, | 529 }, |
| 530 { | 530 { |
| 531 "enable-pnacl", // FLAGS:RECORD_UMA | 531 "disable-pnacl", // FLAGS:RECORD_UMA |
| 532 IDS_FLAGS_ENABLE_PNACL_NAME, | 532 IDS_FLAGS_PNACL_NAME, |
| 533 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION, | 533 IDS_FLAGS_PNACL_DESCRIPTION, |
| 534 kOsDesktop, | 534 kOsDesktop, |
| 535 SINGLE_VALUE_TYPE(switches::kEnablePnacl) | 535 ENABLE_DISABLE_VALUE_TYPE("", switches::kDisablePnacl) |
| 536 }, | 536 }, |
| 537 { | 537 { |
| 538 "extension-apis", // FLAGS:RECORD_UMA | 538 "extension-apis", // FLAGS:RECORD_UMA |
| 539 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 539 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| 540 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, | 540 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, |
| 541 kOsDesktop, | 541 kOsDesktop, |
| 542 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) | 542 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) |
| 543 }, | 543 }, |
| 544 { | 544 { |
| 545 "extensions-on-chrome-urls", | 545 "extensions-on-chrome-urls", |
| (...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2122 } | 2122 } |
| 2123 | 2123 |
| 2124 const Experiment* GetExperiments(size_t* count) { | 2124 const Experiment* GetExperiments(size_t* count) { |
| 2125 *count = num_experiments; | 2125 *count = num_experiments; |
| 2126 return experiments; | 2126 return experiments; |
| 2127 } | 2127 } |
| 2128 | 2128 |
| 2129 } // namespace testing | 2129 } // namespace testing |
| 2130 | 2130 |
| 2131 } // namespace about_flags | 2131 } // namespace about_flags |
| OLD | NEW |