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 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
916 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 916 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
917 kOsWin | kOsLinux | kOsCrOS, | 917 kOsWin | kOsLinux | kOsCrOS, |
918 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 918 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
919 }, | 919 }, |
920 #if defined(OS_CHROMEOS) | 920 #if defined(OS_CHROMEOS) |
921 { | 921 { |
922 "ash-use-alternate-shelf", | 922 "ash-use-alternate-shelf", |
923 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | 923 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, |
924 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | 924 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, |
925 kOsCrOS, | 925 kOsCrOS, |
926 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout) | 926 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, |
| 927 ash::switches::kAshDisableAlternateShelfLayout) |
927 }, | 928 }, |
928 { | 929 { |
929 "ash-enable-drag-off-shelf", | 930 "ash-enable-drag-off-shelf", |
930 IDS_FLAGS_DRAG_OFF_SHELF_NAME, | 931 IDS_FLAGS_DRAG_OFF_SHELF_NAME, |
931 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, | 932 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, |
932 kOsCrOS, | 933 kOsCrOS, |
933 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDragOffShelf) | 934 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDragOffShelf) |
934 }, | 935 }, |
935 { | 936 { |
936 "enable-background-loader", | 937 "enable-background-loader", |
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2113 } | 2114 } |
2114 | 2115 |
2115 const Experiment* GetExperiments(size_t* count) { | 2116 const Experiment* GetExperiments(size_t* count) { |
2116 *count = num_experiments; | 2117 *count = num_experiments; |
2117 return experiments; | 2118 return experiments; |
2118 } | 2119 } |
2119 | 2120 |
2120 } // namespace testing | 2121 } // namespace testing |
2121 | 2122 |
2122 } // namespace about_flags | 2123 } // namespace about_flags |
OLD | NEW |