| 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 #endif | 534 #endif |
| 535 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) | 535 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) |
| 536 }, | 536 }, |
| 537 { | 537 { |
| 538 "enable-media-stream", | 538 "enable-media-stream", |
| 539 IDS_FLAGS_MEDIA_STREAM_NAME, | 539 IDS_FLAGS_MEDIA_STREAM_NAME, |
| 540 IDS_FLAGS_MEDIA_STREAM_DESCRIPTION, | 540 IDS_FLAGS_MEDIA_STREAM_DESCRIPTION, |
| 541 kOsWin | kOsLinux | kOsMac, | 541 kOsWin | kOsLinux | kOsMac, |
| 542 SINGLE_VALUE_TYPE(switches::kEnableMediaStream) | 542 SINGLE_VALUE_TYPE(switches::kEnableMediaStream) |
| 543 }, | 543 }, |
| 544 { |
| 545 "enable-extension-activity-ui", |
| 546 IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME, |
| 547 IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION, |
| 548 kOsAll, |
| 549 SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI) |
| 550 } |
| 544 }; | 551 }; |
| 545 | 552 |
| 546 const Experiment* experiments = kExperiments; | 553 const Experiment* experiments = kExperiments; |
| 547 size_t num_experiments = arraysize(kExperiments); | 554 size_t num_experiments = arraysize(kExperiments); |
| 548 | 555 |
| 549 // Stores and encapsulates the little state that about:flags has. | 556 // Stores and encapsulates the little state that about:flags has. |
| 550 class FlagsState { | 557 class FlagsState { |
| 551 public: | 558 public: |
| 552 FlagsState() : needs_restart_(false) {} | 559 FlagsState() : needs_restart_(false) {} |
| 553 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 560 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 } | 986 } |
| 980 | 987 |
| 981 const Experiment* GetExperiments(size_t* count) { | 988 const Experiment* GetExperiments(size_t* count) { |
| 982 *count = num_experiments; | 989 *count = num_experiments; |
| 983 return experiments; | 990 return experiments; |
| 984 } | 991 } |
| 985 | 992 |
| 986 } // namespace testing | 993 } // namespace testing |
| 987 | 994 |
| 988 } // namespace about_flags | 995 } // namespace about_flags |
| OLD | NEW |