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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) | 429 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) |
430 }, | 430 }, |
431 { | 431 { |
432 "enable-media-source", | 432 "enable-media-source", |
433 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, | 433 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, |
434 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, | 434 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, |
435 kOsAll, | 435 kOsAll, |
436 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) | 436 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) |
437 }, | 437 }, |
438 { | 438 { |
| 439 "enable-encrypted-media", |
| 440 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
| 441 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| 442 kOsAll, |
| 443 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| 444 }, |
| 445 { |
439 "enable-pointer-lock", | 446 "enable-pointer-lock", |
440 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, | 447 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME, |
441 IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION, | 448 IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION, |
442 kOsAll, | 449 kOsAll, |
443 SINGLE_VALUE_TYPE(switches::kEnablePointerLock) | 450 SINGLE_VALUE_TYPE(switches::kEnablePointerLock) |
444 }, | 451 }, |
445 #if defined(USE_ASH) | 452 #if defined(USE_ASH) |
446 { | 453 { |
447 "aura-google-dialog-frames", | 454 "aura-google-dialog-frames", |
448 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, | 455 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, |
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 } | 1040 } |
1034 | 1041 |
1035 const Experiment* GetExperiments(size_t* count) { | 1042 const Experiment* GetExperiments(size_t* count) { |
1036 *count = num_experiments; | 1043 *count = num_experiments; |
1037 return experiments; | 1044 return experiments; |
1038 } | 1045 } |
1039 | 1046 |
1040 } // namespace testing | 1047 } // namespace testing |
1041 | 1048 |
1042 } // namespace about_flags | 1049 } // namespace about_flags |
OLD | NEW |