| 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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 }, | 958 }, |
| 959 #if defined(OS_CHROMEOS) | 959 #if defined(OS_CHROMEOS) |
| 960 { | 960 { |
| 961 "ash-disable-docked-windows", | 961 "ash-disable-docked-windows", |
| 962 IDS_FLAGS_DOCKED_WINDOWS_NAME, | 962 IDS_FLAGS_DOCKED_WINDOWS_NAME, |
| 963 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, | 963 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, |
| 964 kOsCrOS, | 964 kOsCrOS, |
| 965 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) | 965 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) |
| 966 }, | 966 }, |
| 967 { | 967 { |
| 968 "ash-enable-immersive-fullscreen-all-windows2", | |
| 969 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | |
| 970 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | |
| 971 kOsCrOS, | |
| 972 ENABLE_DISABLE_VALUE_TYPE( | |
| 973 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, | |
| 974 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) | |
| 975 }, | |
| 976 { | |
| 977 "network-portal-notification", | 968 "network-portal-notification", |
| 978 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 969 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 979 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, | 970 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, |
| 980 kOsCrOS, | 971 kOsCrOS, |
| 981 ENABLE_DISABLE_VALUE_TYPE( | 972 ENABLE_DISABLE_VALUE_TYPE( |
| 982 chromeos::switches::kEnableNetworkPortalNotification, | 973 chromeos::switches::kEnableNetworkPortalNotification, |
| 983 chromeos::switches::kDisableNetworkPortalNotification) | 974 chromeos::switches::kDisableNetworkPortalNotification) |
| 984 }, | 975 }, |
| 985 #endif | 976 #endif |
| 986 { | 977 { |
| (...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2423 } | 2414 } |
| 2424 | 2415 |
| 2425 const Experiment* GetExperiments(size_t* count) { | 2416 const Experiment* GetExperiments(size_t* count) { |
| 2426 *count = num_experiments; | 2417 *count = num_experiments; |
| 2427 return experiments; | 2418 return experiments; |
| 2428 } | 2419 } |
| 2429 | 2420 |
| 2430 } // namespace testing | 2421 } // namespace testing |
| 2431 | 2422 |
| 2432 } // namespace about_flags | 2423 } // namespace about_flags |
| OLD | NEW |