| 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 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 { | 1363 { |
| 1364 "enable-touch-side-bezels", | 1364 "enable-touch-side-bezels", |
| 1365 IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_NAME, | 1365 IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_NAME, |
| 1366 IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_DESCRIPTION, | 1366 IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_DESCRIPTION, |
| 1367 kOsCrOS, | 1367 kOsCrOS, |
| 1368 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1368 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1369 switches::kTouchSideBezels, "1", | 1369 switches::kTouchSideBezels, "1", |
| 1370 switches::kTouchSideBezels, "0") | 1370 switches::kTouchSideBezels, "0") |
| 1371 }, | 1371 }, |
| 1372 { | 1372 { |
| 1373 "enable-no-touch-to-renderer-while-scrolling", | |
| 1374 IDS_FLAGS_ENABLE_NO_TOUCH_TO_RENDERER_WHILE_SCROLLING_NAME, | |
| 1375 IDS_FLAGS_ENABLE_NO_TOUCH_TO_RENDERER_WHILE_SCROLLING_DESCRIPTION, | |
| 1376 kOsDesktop, | |
| 1377 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | |
| 1378 switches::kNoTouchToRendererWhileScrolling, "1", | |
| 1379 switches::kNoTouchToRendererWhileScrolling, "0") | |
| 1380 }, | |
| 1381 { | |
| 1382 "enable-touch-drag-drop", | 1373 "enable-touch-drag-drop", |
| 1383 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1374 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| 1384 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1375 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| 1385 kOsWin | kOsCrOS, | 1376 kOsWin | kOsCrOS, |
| 1386 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1377 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| 1387 switches::kDisableTouchDragDrop) | 1378 switches::kDisableTouchDragDrop) |
| 1388 }, | 1379 }, |
| 1389 { | 1380 { |
| 1390 "enable-touch-editing", | 1381 "enable-touch-editing", |
| 1391 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1382 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2261 } | 2252 } |
| 2262 | 2253 |
| 2263 const Experiment* GetExperiments(size_t* count) { | 2254 const Experiment* GetExperiments(size_t* count) { |
| 2264 *count = num_experiments; | 2255 *count = num_experiments; |
| 2265 return experiments; | 2256 return experiments; |
| 2266 } | 2257 } |
| 2267 | 2258 |
| 2268 } // namespace testing | 2259 } // namespace testing |
| 2269 | 2260 |
| 2270 } // namespace about_flags | 2261 } // namespace about_flags |
| OLD | NEW |