| 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) | 515 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug) |
| 516 }, | 516 }, |
| 517 { | 517 { |
| 518 "nacl-debug-mask", // FLAGS:RECORD_UMA | 518 "nacl-debug-mask", // FLAGS:RECORD_UMA |
| 519 IDS_FLAGS_NACL_DEBUG_MASK_NAME, | 519 IDS_FLAGS_NACL_DEBUG_MASK_NAME, |
| 520 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 520 IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
| 521 kOsDesktop, | 521 kOsDesktop, |
| 522 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) | 522 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) |
| 523 }, | 523 }, |
| 524 { | 524 { |
| 525 "disable-pnacl", // FLAGS:RECORD_UMA | |
| 526 IDS_FLAGS_PNACL_NAME, | |
| 527 IDS_FLAGS_PNACL_DESCRIPTION, | |
| 528 kOsDesktop, | |
| 529 ENABLE_DISABLE_VALUE_TYPE("", switches::kDisablePnacl) | |
| 530 }, | |
| 531 { | |
| 532 "extension-apis", // FLAGS:RECORD_UMA | 525 "extension-apis", // FLAGS:RECORD_UMA |
| 533 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 526 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| 534 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, | 527 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, |
| 535 kOsDesktop, | 528 kOsDesktop, |
| 536 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis) | 529 SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis) |
| 537 }, | 530 }, |
| 538 { | 531 { |
| 539 "extensions-on-chrome-urls", | 532 "extensions-on-chrome-urls", |
| 540 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, | 533 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, |
| 541 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, | 534 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, |
| (...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2128 } | 2121 } |
| 2129 | 2122 |
| 2130 const Experiment* GetExperiments(size_t* count) { | 2123 const Experiment* GetExperiments(size_t* count) { |
| 2131 *count = num_experiments; | 2124 *count = num_experiments; |
| 2132 return experiments; | 2125 return experiments; |
| 2133 } | 2126 } |
| 2134 | 2127 |
| 2135 } // namespace testing | 2128 } // namespace testing |
| 2136 | 2129 |
| 2137 } // namespace about_flags | 2130 } // namespace about_flags |
| OLD | NEW |