Chromium Code Reviews| 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 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1251 "overscroll-history-navigation", | 1251 "overscroll-history-navigation", |
| 1252 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, | 1252 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| 1253 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, | 1253 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, |
| 1254 kOsAll, | 1254 kOsAll, |
| 1255 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1255 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1256 switches::kOverscrollHistoryNavigation, "1", | 1256 switches::kOverscrollHistoryNavigation, "1", |
| 1257 switches::kOverscrollHistoryNavigation, "0") | 1257 switches::kOverscrollHistoryNavigation, "0") |
| 1258 }, | 1258 }, |
| 1259 #endif | 1259 #endif |
| 1260 { | 1260 { |
| 1261 "enable-touch-cancel-after-scroll", | |
| 1262 IDS_FLAGS_ENABLE_TOUCH_CANCEL_AFTER_SCROLL_NAME, | |
| 1263 IDS_FLAGS_ENABLE_TOUCH_CANCEL_AFTER_SCROLL_DESCRIPTION, | |
| 1264 kOsDesktop, | |
| 1265 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchCancelAfterScroll, | |
|
sadrul
2013/05/30 02:44:16
Use ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
kTouchC
Yufeng Shen (Slow to review)
2013/05/30 22:34:38
Done.
| |
| 1266 switches::kDisableTouchCancelAfterScroll) | |
| 1267 }, | |
| 1268 { | |
| 1261 "enable-touch-drag-drop", | 1269 "enable-touch-drag-drop", |
| 1262 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1270 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| 1263 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1271 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| 1264 kOsWin | kOsCrOS, | 1272 kOsWin | kOsCrOS, |
| 1265 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1273 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| 1266 switches::kDisableTouchDragDrop) | 1274 switches::kDisableTouchDragDrop) |
| 1267 }, | 1275 }, |
| 1268 { | 1276 { |
| 1269 "enable-touch-editing", | 1277 "enable-touch-editing", |
| 1270 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1278 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1938 } | 1946 } |
| 1939 | 1947 |
| 1940 const Experiment* GetExperiments(size_t* count) { | 1948 const Experiment* GetExperiments(size_t* count) { |
| 1941 *count = num_experiments; | 1949 *count = num_experiments; |
| 1942 return experiments; | 1950 return experiments; |
| 1943 } | 1951 } |
| 1944 | 1952 |
| 1945 } // namespace testing | 1953 } // namespace testing |
| 1946 | 1954 |
| 1947 } // namespace about_flags | 1955 } // namespace about_flags |
| OLD | NEW |