| 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 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 }, | 1161 }, |
| 1162 { | 1162 { |
| 1163 "enable-touch-editing", | 1163 "enable-touch-editing", |
| 1164 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1164 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| 1165 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1165 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| 1166 kOsCrOS, | 1166 kOsCrOS, |
| 1167 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1167 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| 1168 switches::kDisableTouchEditing) | 1168 switches::kDisableTouchEditing) |
| 1169 }, | 1169 }, |
| 1170 { | 1170 { |
| 1171 "enable-suggestions-service", |
| 1172 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
| 1173 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
| 1174 kOsAndroid | kOsCrOS, |
| 1175 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, |
| 1176 switches::kDisableSuggestionsService) |
| 1177 }, |
| 1178 { |
| 1171 "enable-sync-synced-notifications", | 1179 "enable-sync-synced-notifications", |
| 1172 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1180 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
| 1173 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1181 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
| 1174 kOsDesktop, | 1182 kOsDesktop, |
| 1175 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1183 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
| 1176 switches::kDisableSyncSyncedNotifications) | 1184 switches::kDisableSyncSyncedNotifications) |
| 1177 }, | 1185 }, |
| 1178 #if defined(ENABLE_APP_LIST) | 1186 #if defined(ENABLE_APP_LIST) |
| 1179 { | 1187 { |
| 1180 "enable-sync-app-list", | 1188 "enable-sync-app-list", |
| (...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2295 } | 2303 } |
| 2296 | 2304 |
| 2297 const Experiment* GetExperiments(size_t* count) { | 2305 const Experiment* GetExperiments(size_t* count) { |
| 2298 *count = num_experiments; | 2306 *count = num_experiments; |
| 2299 return experiments; | 2307 return experiments; |
| 2300 } | 2308 } |
| 2301 | 2309 |
| 2302 } // namespace testing | 2310 } // namespace testing |
| 2303 | 2311 |
| 2304 } // namespace about_flags | 2312 } // namespace about_flags |
| OLD | NEW |