| 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 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 981 }, | 981 }, |
| 982 { | 982 { |
| 983 "disable-touch-adjustment", | 983 "disable-touch-adjustment", |
| 984 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, | 984 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| 985 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 985 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 986 kOsWin | kOsLinux | kOsCrOS, | 986 kOsWin | kOsLinux | kOsCrOS, |
| 987 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 987 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 988 }, | 988 }, |
| 989 #if defined(OS_CHROMEOS) | 989 #if defined(OS_CHROMEOS) |
| 990 { | 990 { |
| 991 "ash-use-alternate-shelf", | |
| 992 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | |
| 993 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | |
| 994 kOsCrOS, | |
| 995 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, | |
| 996 ash::switches::kAshDisableAlternateShelfLayout) | |
| 997 }, | |
| 998 { | |
| 999 "ash-disable-drag-off-shelf", | 991 "ash-disable-drag-off-shelf", |
| 1000 IDS_FLAGS_DRAG_OFF_SHELF_NAME, | 992 IDS_FLAGS_DRAG_OFF_SHELF_NAME, |
| 1001 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, | 993 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, |
| 1002 kOsCrOS, | 994 kOsCrOS, |
| 1003 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) | 995 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) |
| 1004 }, | 996 }, |
| 1005 { | 997 { |
| 1006 "enable-background-loader", | 998 "enable-background-loader", |
| 1007 IDS_ENABLE_BACKLOADER_NAME, | 999 IDS_ENABLE_BACKLOADER_NAME, |
| 1008 IDS_ENABLE_BACKLOADER_DESCRIPTION, | 1000 IDS_ENABLE_BACKLOADER_DESCRIPTION, |
| (...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2489 } | 2481 } |
| 2490 | 2482 |
| 2491 const Experiment* GetExperiments(size_t* count) { | 2483 const Experiment* GetExperiments(size_t* count) { |
| 2492 *count = num_experiments; | 2484 *count = num_experiments; |
| 2493 return experiments; | 2485 return experiments; |
| 2494 } | 2486 } |
| 2495 | 2487 |
| 2496 } // namespace testing | 2488 } // namespace testing |
| 2497 | 2489 |
| 2498 } // namespace about_flags | 2490 } // namespace about_flags |
| OLD | NEW |