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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 // TODO(bbudge): When NaCl switches to the IPC-based proxy, remove this | 432 // TODO(bbudge): When NaCl switches to the IPC-based proxy, remove this |
433 // flag entry. | 433 // flag entry. |
434 { | 434 { |
435 "enable-nacl-srpc-proxy", // FLAGS:RECORD_UMA | 435 "enable-nacl-srpc-proxy", // FLAGS:RECORD_UMA |
436 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME, | 436 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME, |
437 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION, | 437 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION, |
438 kOsAll, | 438 kOsAll, |
439 SINGLE_VALUE_TYPE(switches::kEnableNaClSRPCProxy) | 439 SINGLE_VALUE_TYPE(switches::kEnableNaClSRPCProxy) |
440 }, | 440 }, |
441 { | 441 { |
442 "enable-scripted-speech", // FLAGS:RECORD_UMA | |
443 IDS_FLAGS_ENABLE_SCRIPTED_SPEECH_NAME, | |
444 IDS_FLAGS_ENABLE_SCRIPTED_SPEECH_DESCRIPTION, | |
445 kOsAll, | |
446 SINGLE_VALUE_TYPE(switches::kEnableScriptedSpeech) | |
447 }, | |
448 { | |
449 "extension-apis", // FLAGS:RECORD_UMA | 442 "extension-apis", // FLAGS:RECORD_UMA |
450 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 443 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
451 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, | 444 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, |
452 kOsAll, | 445 kOsAll, |
453 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) | 446 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) |
454 }, | 447 }, |
455 { | 448 { |
456 "action-box", | 449 "action-box", |
457 IDS_FLAGS_ACTION_BOX_NAME, | 450 IDS_FLAGS_ACTION_BOX_NAME, |
458 IDS_FLAGS_ACTION_BOX_DESCRIPTION, | 451 IDS_FLAGS_ACTION_BOX_DESCRIPTION, |
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1577 } | 1570 } |
1578 | 1571 |
1579 const Experiment* GetExperiments(size_t* count) { | 1572 const Experiment* GetExperiments(size_t* count) { |
1580 *count = num_experiments; | 1573 *count = num_experiments; |
1581 return experiments; | 1574 return experiments; |
1582 } | 1575 } |
1583 | 1576 |
1584 } // namespace testing | 1577 } // namespace testing |
1585 | 1578 |
1586 } // namespace about_flags | 1579 } // namespace about_flags |
OLD | NEW |