| 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 948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 ash::switches::kAshDisableAlternateShelfLayout) | 959 ash::switches::kAshDisableAlternateShelfLayout) |
| 960 }, | 960 }, |
| 961 { | 961 { |
| 962 "ash-disable-docked-windows", | 962 "ash-disable-docked-windows", |
| 963 IDS_FLAGS_DOCKED_WINDOWS_NAME, | 963 IDS_FLAGS_DOCKED_WINDOWS_NAME, |
| 964 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, | 964 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, |
| 965 kOsCrOS, | 965 kOsCrOS, |
| 966 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) | 966 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) |
| 967 }, | 967 }, |
| 968 { | 968 { |
| 969 "ash-enable-immersive-fullscreen-all-windows2", | |
| 970 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | |
| 971 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | |
| 972 kOsCrOS, | |
| 973 ENABLE_DISABLE_VALUE_TYPE( | |
| 974 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, | |
| 975 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) | |
| 976 }, | |
| 977 { | |
| 978 "network-portal-notification", | 969 "network-portal-notification", |
| 979 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 970 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 980 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, | 971 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, |
| 981 kOsCrOS, | 972 kOsCrOS, |
| 982 ENABLE_DISABLE_VALUE_TYPE( | 973 ENABLE_DISABLE_VALUE_TYPE( |
| 983 chromeos::switches::kEnableNetworkPortalNotification, | 974 chromeos::switches::kEnableNetworkPortalNotification, |
| 984 chromeos::switches::kDisableNetworkPortalNotification) | 975 chromeos::switches::kDisableNetworkPortalNotification) |
| 985 }, | 976 }, |
| 986 #endif | 977 #endif |
| 987 { | 978 { |
| (...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2378 } | 2369 } |
| 2379 | 2370 |
| 2380 const Experiment* GetExperiments(size_t* count) { | 2371 const Experiment* GetExperiments(size_t* count) { |
| 2381 *count = num_experiments; | 2372 *count = num_experiments; |
| 2382 return experiments; | 2373 return experiments; |
| 2383 } | 2374 } |
| 2384 | 2375 |
| 2385 } // namespace testing | 2376 } // namespace testing |
| 2386 | 2377 |
| 2387 } // namespace about_flags | 2378 } // namespace about_flags |
| OLD | NEW |