OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 }, | 443 }, |
444 #if defined(OS_CHROMEOS) | 444 #if defined(OS_CHROMEOS) |
445 { | 445 { |
446 "enable-photo-editor", | 446 "enable-photo-editor", |
447 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME, | 447 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME, |
448 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION, | 448 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION, |
449 kOsCrOS, | 449 kOsCrOS, |
450 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor) | 450 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor) |
451 }, | 451 }, |
452 #endif | 452 #endif |
| 453 { |
| 454 "enable-media-source", |
| 455 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, |
| 456 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, |
| 457 kOsAll, |
| 458 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) |
| 459 }, |
453 }; | 460 }; |
454 | 461 |
455 const Experiment* experiments = kExperiments; | 462 const Experiment* experiments = kExperiments; |
456 size_t num_experiments = arraysize(kExperiments); | 463 size_t num_experiments = arraysize(kExperiments); |
457 | 464 |
458 // Stores and encapsulates the little state that about:flags has. | 465 // Stores and encapsulates the little state that about:flags has. |
459 class FlagsState { | 466 class FlagsState { |
460 public: | 467 public: |
461 FlagsState() : needs_restart_(false) {} | 468 FlagsState() : needs_restart_(false) {} |
462 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 469 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 } | 879 } |
873 | 880 |
874 const Experiment* GetExperiments(size_t* count) { | 881 const Experiment* GetExperiments(size_t* count) { |
875 *count = num_experiments; | 882 *count = num_experiments; |
876 return experiments; | 883 return experiments; |
877 } | 884 } |
878 | 885 |
879 } // namespace testing | 886 } // namespace testing |
880 | 887 |
881 } // namespace about_flags | 888 } // namespace about_flags |
OLD | NEW |