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 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1172 }, | 1172 }, |
1173 { | 1173 { |
1174 "enable-touch-editing", | 1174 "enable-touch-editing", |
1175 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1175 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
1176 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1176 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
1177 kOsCrOS, | 1177 kOsCrOS, |
1178 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1178 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
1179 switches::kDisableTouchEditing) | 1179 switches::kDisableTouchEditing) |
1180 }, | 1180 }, |
1181 { | 1181 { |
1182 "enable-suggestions-service", | |
1183 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, | |
1184 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | |
1185 kOsAll, | |
beaudoin
2014/04/23 21:43:17
Just making sure this is what you want, it's not m
Mathieu
2014/04/24 13:23:11
I'll set it for Android and CrOS. On other platfor
| |
1186 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, | |
1187 switches::kDisableSuggestionsService) | |
1188 }, | |
1189 { | |
1182 "enable-sync-synced-notifications", | 1190 "enable-sync-synced-notifications", |
1183 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1191 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
1184 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1192 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
1185 kOsDesktop, | 1193 kOsDesktop, |
1186 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1194 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
1187 switches::kDisableSyncSyncedNotifications) | 1195 switches::kDisableSyncSyncedNotifications) |
1188 }, | 1196 }, |
1189 #if defined(ENABLE_APP_LIST) | 1197 #if defined(ENABLE_APP_LIST) |
1190 { | 1198 { |
1191 "enable-sync-app-list", | 1199 "enable-sync-app-list", |
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2313 } | 2321 } |
2314 | 2322 |
2315 const Experiment* GetExperiments(size_t* count) { | 2323 const Experiment* GetExperiments(size_t* count) { |
2316 *count = num_experiments; | 2324 *count = num_experiments; |
2317 return experiments; | 2325 return experiments; |
2318 } | 2326 } |
2319 | 2327 |
2320 } // namespace testing | 2328 } // namespace testing |
2321 | 2329 |
2322 } // namespace about_flags | 2330 } // namespace about_flags |
OLD | NEW |