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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 SINGLE_VALUE_TYPE(switches::kAuraTranslucentFrames) | 438 SINGLE_VALUE_TYPE(switches::kAuraTranslucentFrames) |
439 }, | 439 }, |
440 #endif // defined(USE_AURA) | 440 #endif // defined(USE_AURA) |
441 { | 441 { |
442 "enable-gamepad", | 442 "enable-gamepad", |
443 IDS_FLAGS_ENABLE_GAMEPAD_NAME, | 443 IDS_FLAGS_ENABLE_GAMEPAD_NAME, |
444 IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION, | 444 IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION, |
445 kOsMac | kOsWin, | 445 kOsMac | kOsWin, |
446 SINGLE_VALUE_TYPE(switches::kEnableGamepad) | 446 SINGLE_VALUE_TYPE(switches::kEnableGamepad) |
447 }, | 447 }, |
| 448 { |
| 449 "enable-javascript-harmony", |
| 450 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| 451 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| 452 kOsAll, |
| 453 SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") |
| 454 }, |
448 }; | 455 }; |
449 | 456 |
450 const Experiment* experiments = kExperiments; | 457 const Experiment* experiments = kExperiments; |
451 size_t num_experiments = arraysize(kExperiments); | 458 size_t num_experiments = arraysize(kExperiments); |
452 | 459 |
453 // Stores and encapsulates the little state that about:flags has. | 460 // Stores and encapsulates the little state that about:flags has. |
454 class FlagsState { | 461 class FlagsState { |
455 public: | 462 public: |
456 FlagsState() : needs_restart_(false) {} | 463 FlagsState() : needs_restart_(false) {} |
457 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 464 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
867 } | 874 } |
868 | 875 |
869 const Experiment* GetExperiments(size_t* count) { | 876 const Experiment* GetExperiments(size_t* count) { |
870 *count = num_experiments; | 877 *count = num_experiments; |
871 return experiments; | 878 return experiments; |
872 } | 879 } |
873 | 880 |
874 } // namespace testing | 881 } // namespace testing |
875 | 882 |
876 } // namespace about_flags | 883 } // namespace about_flags |
OLD | NEW |