| 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 <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1073 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, | 1073 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| 1074 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAll, | 1074 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAll, |
| 1075 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)}, | 1075 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)}, |
| 1076 #endif // USE_AURA | 1076 #endif // USE_AURA |
| 1077 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME, | 1077 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
| 1078 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS, | 1078 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS, |
| 1079 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, | 1079 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, |
| 1080 "1", | 1080 "1", |
| 1081 switches::kScrollEndEffect, | 1081 switches::kScrollEndEffect, |
| 1082 "0")}, | 1082 "0")}, |
| 1083 {"enable-icon-ntp", IDS_FLAGS_ICON_NTP_NAME, IDS_FLAGS_ICON_NTP_DESCRIPTION, | |
| 1084 kOsAll, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp, | |
| 1085 switches::kDisableIconNtp)}, | |
| 1086 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME, | 1083 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME, |
| 1087 IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS, | 1084 IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS, |
| 1088 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1085 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| 1089 switches::kDisableTouchDragDrop)}, | 1086 switches::kDisableTouchDragDrop)}, |
| 1090 {"touch-selection-strategy", IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, | 1087 {"touch-selection-strategy", IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, |
| 1091 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, | 1088 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, |
| 1092 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. | 1089 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. |
| 1093 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)}, | 1090 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)}, |
| 1094 {"enable-navigation-tracing", IDS_FLAGS_ENABLE_NAVIGATION_TRACING, | 1091 {"enable-navigation-tracing", IDS_FLAGS_ENABLE_NAVIGATION_TRACING, |
| 1095 IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, kOsAll, | 1092 IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, kOsAll, |
| (...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2401 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2398 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2402 | 2399 |
| 2403 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2400 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2404 *count = arraysize(kFeatureEntries); | 2401 *count = arraysize(kFeatureEntries); |
| 2405 return kFeatureEntries; | 2402 return kFeatureEntries; |
| 2406 } | 2403 } |
| 2407 | 2404 |
| 2408 } // namespace testing | 2405 } // namespace testing |
| 2409 | 2406 |
| 2410 } // namespace about_flags | 2407 } // namespace about_flags |
| OLD | NEW |