| 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 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1953     SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 1953     SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 
| 1954   }, | 1954   }, | 
| 1955 #endif | 1955 #endif | 
| 1956   { | 1956   { | 
| 1957     "embed-flash-fullscreen", | 1957     "embed-flash-fullscreen", | 
| 1958     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 1958     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 
| 1959     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 1959     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 
| 1960     kOsDesktop, | 1960     kOsDesktop, | 
| 1961     SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 1961     SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 
| 1962   }, | 1962   }, | 
| 1963 #if defined(USE_ASH) && defined(OS_CHROMEOS) |  | 
| 1964   { |  | 
| 1965     "enable-system-sounds", |  | 
| 1966     IDS_FLAGS_ENABLE_SYSTEM_SOUNDS_NAME, |  | 
| 1967     IDS_FLAGS_ENABLE_SYSTEM_SOUNDS_DESCRIPTION, |  | 
| 1968     kOsCrOS, |  | 
| 1969     SINGLE_VALUE_TYPE(ash::switches::kAshEnableSystemSounds) |  | 
| 1970   }, |  | 
| 1971 #endif |  | 
| 1972 #if defined(USE_AURA) | 1963 #if defined(USE_AURA) | 
| 1973   { | 1964   { | 
| 1974     "use-system-title-bar", | 1965     "use-system-title-bar", | 
| 1975     IDS_FLAGS_USE_SYSTEM_TITLE_BAR, | 1966     IDS_FLAGS_USE_SYSTEM_TITLE_BAR, | 
| 1976     IDS_FLAGS_USE_SYSTEM_TITLE_BAR_DESCRIPTION, | 1967     IDS_FLAGS_USE_SYSTEM_TITLE_BAR_DESCRIPTION, | 
| 1977     kOsLinux, | 1968     kOsLinux, | 
| 1978     SINGLE_VALUE_TYPE(switches::kUseSystemTitleBar) | 1969     SINGLE_VALUE_TYPE(switches::kUseSystemTitleBar) | 
| 1979   }, | 1970   }, | 
| 1980 #endif | 1971 #endif | 
| 1981 #if defined(USE_AURA) || defined(OS_WIN) | 1972 #if defined(USE_AURA) || defined(OS_WIN) | 
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2498 } | 2489 } | 
| 2499 | 2490 | 
| 2500 const Experiment* GetExperiments(size_t* count) { | 2491 const Experiment* GetExperiments(size_t* count) { | 
| 2501   *count = num_experiments; | 2492   *count = num_experiments; | 
| 2502   return experiments; | 2493   return experiments; | 
| 2503 } | 2494 } | 
| 2504 | 2495 | 
| 2505 }  // namespace testing | 2496 }  // namespace testing | 
| 2506 | 2497 | 
| 2507 }  // namespace about_flags | 2498 }  // namespace about_flags | 
| OLD | NEW | 
|---|