| 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 1952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1963 SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 1963 SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) |
| 1964 }, | 1964 }, |
| 1965 #endif | 1965 #endif |
| 1966 { | 1966 { |
| 1967 "embed-flash-fullscreen", | 1967 "embed-flash-fullscreen", |
| 1968 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 1968 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, |
| 1969 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 1969 IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, |
| 1970 kOsDesktop, | 1970 kOsDesktop, |
| 1971 SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 1971 SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) |
| 1972 }, | 1972 }, |
| 1973 #if defined(USE_AURA) | |
| 1974 { | |
| 1975 "use-system-title-bar", | |
| 1976 IDS_FLAGS_USE_SYSTEM_TITLE_BAR, | |
| 1977 IDS_FLAGS_USE_SYSTEM_TITLE_BAR_DESCRIPTION, | |
| 1978 kOsLinux, | |
| 1979 SINGLE_VALUE_TYPE(switches::kUseSystemTitleBar) | |
| 1980 }, | |
| 1981 #endif | |
| 1982 #if defined(USE_AURA) || defined(OS_WIN) | 1973 #if defined(USE_AURA) || defined(OS_WIN) |
| 1983 { | 1974 { |
| 1984 "enable-permissions-bubbles", | 1975 "enable-permissions-bubbles", |
| 1985 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, | 1976 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, |
| 1986 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, | 1977 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, |
| 1987 kOsCrOS | kOsWin, | 1978 kOsCrOS | kOsWin, |
| 1988 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) | 1979 SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) |
| 1989 }, | 1980 }, |
| 1990 #endif | 1981 #endif |
| 1991 { | 1982 { |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2515 } | 2506 } |
| 2516 | 2507 |
| 2517 const Experiment* GetExperiments(size_t* count) { | 2508 const Experiment* GetExperiments(size_t* count) { |
| 2518 *count = num_experiments; | 2509 *count = num_experiments; |
| 2519 return experiments; | 2510 return experiments; |
| 2520 } | 2511 } |
| 2521 | 2512 |
| 2522 } // namespace testing | 2513 } // namespace testing |
| 2523 | 2514 |
| 2524 } // namespace about_flags | 2515 } // namespace about_flags |
| OLD | NEW |