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 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1230 kOsCrOS, | 1230 kOsCrOS, |
1231 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragAndDropAppListToLauncher), | 1231 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragAndDropAppListToLauncher), |
1232 }, | 1232 }, |
1233 { "ash-immersive-fullscreen-2", | 1233 { "ash-immersive-fullscreen-2", |
1234 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, | 1234 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, |
1235 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, | 1235 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, |
1236 kOsCrOS, | 1236 kOsCrOS, |
1237 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreen, | 1237 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreen, |
1238 ash::switches::kAshDisableImmersiveFullscreen), | 1238 ash::switches::kAshDisableImmersiveFullscreen), |
1239 }, | 1239 }, |
| 1240 { "ash-use-same-frame-for-v1-and-v2-apps", |
| 1241 IDS_FLAGS_ASH_USE_SAME_FRAME_FOR_V1_AND_V2_APPS_NAME, |
| 1242 IDS_FLAGS_ASH_USE_SAME_FRAME_FOR_V1_AND_V2_APPS_DESCRIPTION, |
| 1243 kOsCrOS, |
| 1244 SINGLE_VALUE_TYPE(ash::switches::kAshUseSameFrameForV1AndV2Apps), |
| 1245 }, |
1240 #if defined(OS_LINUX) | 1246 #if defined(OS_LINUX) |
1241 { "ash-enable-memory-monitor", | 1247 { "ash-enable-memory-monitor", |
1242 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, | 1248 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
1243 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, | 1249 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
1244 kOsCrOS, | 1250 kOsCrOS, |
1245 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), | 1251 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), |
1246 }, | 1252 }, |
1247 #endif | 1253 #endif |
1248 #if defined(OS_CHROMEOS) | 1254 #if defined(OS_CHROMEOS) |
1249 { "ash-enable-multi-profile-shelf", | 1255 { "ash-enable-multi-profile-shelf", |
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2268 } | 2274 } |
2269 | 2275 |
2270 const Experiment* GetExperiments(size_t* count) { | 2276 const Experiment* GetExperiments(size_t* count) { |
2271 *count = num_experiments; | 2277 *count = num_experiments; |
2272 return experiments; | 2278 return experiments; |
2273 } | 2279 } |
2274 | 2280 |
2275 } // namespace testing | 2281 } // namespace testing |
2276 | 2282 |
2277 } // namespace about_flags | 2283 } // namespace about_flags |
OLD | NEW |