| 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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 }, | 951 }, |
| 952 { | 952 { |
| 953 "disable-touch-adjustment", | 953 "disable-touch-adjustment", |
| 954 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, | 954 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| 955 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 955 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 956 kOsWin | kOsLinux | kOsCrOS, | 956 kOsWin | kOsLinux | kOsCrOS, |
| 957 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 957 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 958 }, | 958 }, |
| 959 #if defined(OS_CHROMEOS) | 959 #if defined(OS_CHROMEOS) |
| 960 { | 960 { |
| 961 "ash-use-alternate-shelf", | |
| 962 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | |
| 963 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | |
| 964 kOsCrOS, | |
| 965 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, | |
| 966 ash::switches::kAshDisableAlternateShelfLayout) | |
| 967 }, | |
| 968 { | |
| 969 "ash-disable-docked-windows", | 961 "ash-disable-docked-windows", |
| 970 IDS_FLAGS_DOCKED_WINDOWS_NAME, | 962 IDS_FLAGS_DOCKED_WINDOWS_NAME, |
| 971 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, | 963 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, |
| 972 kOsCrOS, | 964 kOsCrOS, |
| 973 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) | 965 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) |
| 974 }, | 966 }, |
| 975 { | 967 { |
| 976 "ash-enable-immersive-fullscreen-all-windows2", | 968 "ash-enable-immersive-fullscreen-all-windows2", |
| 977 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | 969 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, |
| 978 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | 970 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, |
| (...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2431 } | 2423 } |
| 2432 | 2424 |
| 2433 const Experiment* GetExperiments(size_t* count) { | 2425 const Experiment* GetExperiments(size_t* count) { |
| 2434 *count = num_experiments; | 2426 *count = num_experiments; |
| 2435 return experiments; | 2427 return experiments; |
| 2436 } | 2428 } |
| 2437 | 2429 |
| 2438 } // namespace testing | 2430 } // namespace testing |
| 2439 | 2431 |
| 2440 } // namespace about_flags | 2432 } // namespace about_flags |
| OLD | NEW |