| 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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 }, | 1160 }, |
| 1161 #if defined(USE_AURA) | 1161 #if defined(USE_AURA) |
| 1162 { | 1162 { |
| 1163 "enable-overscroll-history-navigation", | 1163 "enable-overscroll-history-navigation", |
| 1164 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME, | 1164 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| 1165 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, | 1165 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, |
| 1166 kOsAll, | 1166 kOsAll, |
| 1167 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation) | 1167 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation) |
| 1168 }, | 1168 }, |
| 1169 #endif | 1169 #endif |
| 1170 | |
| 1171 { | 1170 { |
| 1172 "enable-touch-drag-drop", | 1171 "enable-touch-drag-drop", |
| 1173 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1172 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| 1174 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1173 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| 1175 kOsWin | kOsCrOS, | 1174 kOsWin | kOsCrOS, |
| 1176 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) | 1175 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) |
| 1177 }, | 1176 }, |
| 1178 { | 1177 { |
| 1179 "load-cloud-policy-on-signin", | 1178 "load-cloud-policy-on-signin", |
| 1180 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, | 1179 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1196 kOsAll, | 1195 kOsAll, |
| 1197 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) | 1196 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) |
| 1198 }, | 1197 }, |
| 1199 { | 1198 { |
| 1200 "enable-data-channels", | 1199 "enable-data-channels", |
| 1201 IDS_FLAGS_RTC_DATACHANNELS, | 1200 IDS_FLAGS_RTC_DATACHANNELS, |
| 1202 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION, | 1201 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION, |
| 1203 kOsAll, | 1202 kOsAll, |
| 1204 SINGLE_VALUE_TYPE(switches::kEnableDataChannels) | 1203 SINGLE_VALUE_TYPE(switches::kEnableDataChannels) |
| 1205 }, | 1204 }, |
| 1205 { |
| 1206 "enable-sync-dictionary", |
| 1207 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_NAME, |
| 1208 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_DESCRIPTION, |
| 1209 kOsWin | kOsCrOS | kOsLinux, |
| 1210 SINGLE_VALUE_TYPE(switches::kEnableSyncDictionary) |
| 1211 }, |
| 1206 }; | 1212 }; |
| 1207 | 1213 |
| 1208 const Experiment* experiments = kExperiments; | 1214 const Experiment* experiments = kExperiments; |
| 1209 size_t num_experiments = arraysize(kExperiments); | 1215 size_t num_experiments = arraysize(kExperiments); |
| 1210 | 1216 |
| 1211 // Stores and encapsulates the little state that about:flags has. | 1217 // Stores and encapsulates the little state that about:flags has. |
| 1212 class FlagsState { | 1218 class FlagsState { |
| 1213 public: | 1219 public: |
| 1214 FlagsState() : needs_restart_(false) {} | 1220 FlagsState() : needs_restart_(false) {} |
| 1215 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 1221 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1632 } | 1638 } |
| 1633 | 1639 |
| 1634 const Experiment* GetExperiments(size_t* count) { | 1640 const Experiment* GetExperiments(size_t* count) { |
| 1635 *count = num_experiments; | 1641 *count = num_experiments; |
| 1636 return experiments; | 1642 return experiments; |
| 1637 } | 1643 } |
| 1638 | 1644 |
| 1639 } // namespace testing | 1645 } // namespace testing |
| 1640 | 1646 |
| 1641 } // namespace about_flags | 1647 } // namespace about_flags |
| OLD | NEW |