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 <iterator> | 7 #include <iterator> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1961 SINGLE_VALUE_TYPE(chromeos::switches::kEnableOkGoogleVoiceSearch) | 1961 SINGLE_VALUE_TYPE(chromeos::switches::kEnableOkGoogleVoiceSearch) |
1962 }, | 1962 }, |
1963 #endif | 1963 #endif |
1964 { | 1964 { |
1965 "enable-embedded-extension-options", | 1965 "enable-embedded-extension-options", |
1966 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, | 1966 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, |
1967 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, | 1967 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, |
1968 kOsDesktop, | 1968 kOsDesktop, |
1969 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions) | 1969 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions) |
1970 }, | 1970 }, |
| 1971 { |
| 1972 "enable-website-settings-manager", |
| 1973 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, |
| 1974 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, |
| 1975 kOsDesktop, |
| 1976 SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager) |
| 1977 }, |
1971 }; | 1978 }; |
1972 | 1979 |
1973 const Experiment* experiments = kExperiments; | 1980 const Experiment* experiments = kExperiments; |
1974 size_t num_experiments = arraysize(kExperiments); | 1981 size_t num_experiments = arraysize(kExperiments); |
1975 | 1982 |
1976 // Stores and encapsulates the little state that about:flags has. | 1983 // Stores and encapsulates the little state that about:flags has. |
1977 class FlagsState { | 1984 class FlagsState { |
1978 public: | 1985 public: |
1979 FlagsState() : needs_restart_(false) {} | 1986 FlagsState() : needs_restart_(false) {} |
1980 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1987 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2489 } | 2496 } |
2490 | 2497 |
2491 const Experiment* GetExperiments(size_t* count) { | 2498 const Experiment* GetExperiments(size_t* count) { |
2492 *count = num_experiments; | 2499 *count = num_experiments; |
2493 return experiments; | 2500 return experiments; |
2494 } | 2501 } |
2495 | 2502 |
2496 } // namespace testing | 2503 } // namespace testing |
2497 | 2504 |
2498 } // namespace about_flags | 2505 } // namespace about_flags |
OLD | NEW |