| 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 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1291 "overscroll-history-navigation", | 1291 "overscroll-history-navigation", |
| 1292 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, | 1292 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| 1293 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, | 1293 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, |
| 1294 kOsAll, | 1294 kOsAll, |
| 1295 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1295 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1296 switches::kOverscrollHistoryNavigation, "1", | 1296 switches::kOverscrollHistoryNavigation, "1", |
| 1297 switches::kOverscrollHistoryNavigation, "0") | 1297 switches::kOverscrollHistoryNavigation, "0") |
| 1298 }, | 1298 }, |
| 1299 #endif | 1299 #endif |
| 1300 { | 1300 { |
| 1301 "enable-touch-cancel-on-scroll", |
| 1302 IDS_FLAGS_ENABLE_TOUCH_CANCEL_ON_SCROLL_NAME, |
| 1303 IDS_FLAGS_ENABLE_TOUCH_CANCEL_ON_SCROLL_DESCRIPTION, |
| 1304 kOsDesktop, |
| 1305 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1306 switches::kTouchCancelOnScroll, "1", |
| 1307 switches::kTouchCancelOnScroll, "0") |
| 1308 }, |
| 1309 { |
| 1301 "enable-touch-drag-drop", | 1310 "enable-touch-drag-drop", |
| 1302 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1311 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| 1303 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1312 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| 1304 kOsWin | kOsCrOS, | 1313 kOsWin | kOsCrOS, |
| 1305 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1314 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| 1306 switches::kDisableTouchDragDrop) | 1315 switches::kDisableTouchDragDrop) |
| 1307 }, | 1316 }, |
| 1308 { | 1317 { |
| 1309 "enable-touch-editing", | 1318 "enable-touch-editing", |
| 1310 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1319 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2056 } | 2065 } |
| 2057 | 2066 |
| 2058 const Experiment* GetExperiments(size_t* count) { | 2067 const Experiment* GetExperiments(size_t* count) { |
| 2059 *count = num_experiments; | 2068 *count = num_experiments; |
| 2060 return experiments; | 2069 return experiments; |
| 2061 } | 2070 } |
| 2062 | 2071 |
| 2063 } // namespace testing | 2072 } // namespace testing |
| 2064 | 2073 |
| 2065 } // namespace about_flags | 2074 } // namespace about_flags |
| OLD | NEW |