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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
516 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, | 516 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
517 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, | 517 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
518 #if defined(ENABLE_SWIFTSHADER) | 518 #if defined(ENABLE_SWIFTSHADER) |
519 kOsAll, | 519 kOsAll, |
520 #else | 520 #else |
521 0, | 521 0, |
522 #endif | 522 #endif |
523 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) | 523 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) |
524 }, | 524 }, |
525 { | 525 { |
526 "enable-media-stream", | |
527 IDS_FLAGS_MEDIA_STREAM_NAME, | |
jam
2012/05/14 06:30:11
also remove from the grd file?
wjia(left Chromium)
2012/05/14 20:42:17
Done.
| |
528 IDS_FLAGS_MEDIA_STREAM_DESCRIPTION, | |
529 kOsAll, | |
530 SINGLE_VALUE_TYPE(switches::kEnableMediaStream) | |
531 }, | |
532 { | |
533 "enable-peer-connection", | 526 "enable-peer-connection", |
534 IDS_FLAGS_PEER_CONNECTION_NAME, | 527 IDS_FLAGS_PEER_CONNECTION_NAME, |
535 IDS_FLAGS_PEER_CONNECTION_DESCRIPTION, | 528 IDS_FLAGS_PEER_CONNECTION_DESCRIPTION, |
536 kOsAll, | 529 kOsAll, |
537 SINGLE_VALUE_TYPE(switches::kEnablePeerConnection) | 530 SINGLE_VALUE_TYPE(switches::kEnablePeerConnection) |
538 }, | 531 }, |
539 { | 532 { |
540 "enable-shadow-dom", | 533 "enable-shadow-dom", |
541 IDS_FLAGS_SHADOW_DOM_NAME, | 534 IDS_FLAGS_SHADOW_DOM_NAME, |
542 IDS_FLAGS_SHADOW_DOM_DESCRIPTION, | 535 IDS_FLAGS_SHADOW_DOM_DESCRIPTION, |
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1142 } | 1135 } |
1143 | 1136 |
1144 const Experiment* GetExperiments(size_t* count) { | 1137 const Experiment* GetExperiments(size_t* count) { |
1145 *count = num_experiments; | 1138 *count = num_experiments; |
1146 return experiments; | 1139 return experiments; |
1147 } | 1140 } |
1148 | 1141 |
1149 } // namespace testing | 1142 } // namespace testing |
1150 | 1143 |
1151 } // namespace about_flags | 1144 } // namespace about_flags |
OLD | NEW |