| 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 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 908 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 909 kOsWin | kOsLinux | kOsCrOS, | 909 kOsWin | kOsLinux | kOsCrOS, |
| 910 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 910 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 911 }, | 911 }, |
| 912 #if defined(OS_CHROMEOS) | 912 #if defined(OS_CHROMEOS) |
| 913 { | 913 { |
| 914 "ash-use-alternate-shelf", | 914 "ash-use-alternate-shelf", |
| 915 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | 915 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, |
| 916 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | 916 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, |
| 917 kOsCrOS, | 917 kOsCrOS, |
| 918 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout) | 918 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, |
| 919 ash::switches::kAshDisableAlternateShelfLayout) |
| 919 }, | 920 }, |
| 920 { | 921 { |
| 921 "ash-enable-drag-off-shelf", | 922 "ash-enable-drag-off-shelf", |
| 922 IDS_FLAGS_DRAG_OFF_SHELF_NAME, | 923 IDS_FLAGS_DRAG_OFF_SHELF_NAME, |
| 923 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, | 924 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, |
| 924 kOsCrOS, | 925 kOsCrOS, |
| 925 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDragOffShelf) | 926 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDragOffShelf) |
| 926 }, | 927 }, |
| 927 { | 928 { |
| 928 "enable-background-loader", | 929 "enable-background-loader", |
| (...skipping 1184 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 |