| 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 943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 }, | 954 }, |
| 955 { | 955 { |
| 956 "disable-touch-adjustment", | 956 "disable-touch-adjustment", |
| 957 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, | 957 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| 958 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 958 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 959 kOsWin | kOsLinux | kOsCrOS, | 959 kOsWin | kOsLinux | kOsCrOS, |
| 960 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 960 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 961 }, | 961 }, |
| 962 #if defined(OS_CHROMEOS) | 962 #if defined(OS_CHROMEOS) |
| 963 { | 963 { |
| 964 "ash-use-alternate-shelf", | |
| 965 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | |
| 966 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | |
| 967 kOsCrOS, | |
| 968 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, | |
| 969 ash::switches::kAshDisableAlternateShelfLayout) | |
| 970 }, | |
| 971 { | |
| 972 "ash-disable-drag-off-shelf", | 964 "ash-disable-drag-off-shelf", |
| 973 IDS_FLAGS_DRAG_OFF_SHELF_NAME, | 965 IDS_FLAGS_DRAG_OFF_SHELF_NAME, |
| 974 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, | 966 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, |
| 975 kOsCrOS, | 967 kOsCrOS, |
| 976 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) | 968 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) |
| 977 }, | 969 }, |
| 978 { | 970 { |
| 979 "enable-background-loader", | 971 "enable-background-loader", |
| 980 IDS_ENABLE_BACKLOADER_NAME, | 972 IDS_ENABLE_BACKLOADER_NAME, |
| 981 IDS_ENABLE_BACKLOADER_DESCRIPTION, | 973 IDS_ENABLE_BACKLOADER_DESCRIPTION, |
| (...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2427 } | 2419 } |
| 2428 | 2420 |
| 2429 const Experiment* GetExperiments(size_t* count) { | 2421 const Experiment* GetExperiments(size_t* count) { |
| 2430 *count = num_experiments; | 2422 *count = num_experiments; |
| 2431 return experiments; | 2423 return experiments; |
| 2432 } | 2424 } |
| 2433 | 2425 |
| 2434 } // namespace testing | 2426 } // namespace testing |
| 2435 | 2427 |
| 2436 } // namespace about_flags | 2428 } // namespace about_flags |
| OLD | NEW |