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 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1954 kOsWin | kOsCrOS, | 1954 kOsWin | kOsCrOS, |
1955 SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 1955 SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) |
1956 }, | 1956 }, |
1957 #endif | 1957 #endif |
1958 { | 1958 { |
1959 "embed-flash-fullscreen", | 1959 "embed-flash-fullscreen", |
1960 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 1960 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, |
1961 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 1961 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, |
1962 kOsDesktop, | 1962 kOsDesktop, |
1963 SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 1963 SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) |
| 1964 }, |
| 1965 #if defined(USE_ASH) && defined(OS_CHROMEOS) |
| 1966 { |
| 1967 "enable-system-sounds", |
| 1968 IDS_FLAGS_ENABLE_SYSTEM_SOUNDS_NAME, |
| 1969 IDS_FLAGS_ENABLE_SYSTEM_SOUNDS_DESCRIPTION, |
| 1970 kOsCrOS, |
| 1971 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSystemSounds) |
1964 } | 1972 } |
| 1973 #endif |
1965 }; | 1974 }; |
1966 | 1975 |
1967 const Experiment* experiments = kExperiments; | 1976 const Experiment* experiments = kExperiments; |
1968 size_t num_experiments = arraysize(kExperiments); | 1977 size_t num_experiments = arraysize(kExperiments); |
1969 | 1978 |
1970 // Stores and encapsulates the little state that about:flags has. | 1979 // Stores and encapsulates the little state that about:flags has. |
1971 class FlagsState { | 1980 class FlagsState { |
1972 public: | 1981 public: |
1973 FlagsState() : needs_restart_(false) {} | 1982 FlagsState() : needs_restart_(false) {} |
1974 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1983 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2466 } | 2475 } |
2467 | 2476 |
2468 const Experiment* GetExperiments(size_t* count) { | 2477 const Experiment* GetExperiments(size_t* count) { |
2469 *count = num_experiments; | 2478 *count = num_experiments; |
2470 return experiments; | 2479 return experiments; |
2471 } | 2480 } |
2472 | 2481 |
2473 } // namespace testing | 2482 } // namespace testing |
2474 | 2483 |
2475 } // namespace about_flags | 2484 } // namespace about_flags |
OLD | NEW |