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 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1303 { | 1303 { |
1304 "enable-sync-synced-notifications", | 1304 "enable-sync-synced-notifications", |
1305 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1305 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
1306 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1306 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
1307 kOsDesktop, | 1307 kOsDesktop, |
1308 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1308 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
1309 switches::kDisableSyncSyncedNotifications) | 1309 switches::kDisableSyncSyncedNotifications) |
1310 }, | 1310 }, |
1311 #if defined(ENABLE_APP_LIST) | 1311 #if defined(ENABLE_APP_LIST) |
1312 { | 1312 { |
1313 "enable-sync-app-list", | 1313 "enable-sync-app-list", |
tapted
2014/03/05 22:33:38
Pretty sure this needs to change too. The comment
jennyz
2014/03/05 22:39:20
+1
stevenjb
2014/03/05 23:20:00
DOh. Thanks, you're right.
Done.
| |
1314 IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, | 1314 IDS_FLAGS_DISABLE_SYNC_APP_LIST_NAME, |
1315 IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION, | 1315 IDS_FLAGS_DISABLE_SYNC_APP_LIST_DESCRIPTION, |
1316 kOsDesktop, | 1316 kOsDesktop, |
1317 SINGLE_VALUE_TYPE(switches::kEnableSyncAppList) | 1317 SINGLE_VALUE_TYPE(switches::kDisableSyncAppList) |
1318 }, | 1318 }, |
1319 #endif | 1319 #endif |
1320 { | 1320 { |
1321 "disable-full-history-sync", | 1321 "disable-full-history-sync", |
1322 IDS_FLAGS_FULL_HISTORY_SYNC_NAME, | 1322 IDS_FLAGS_FULL_HISTORY_SYNC_NAME, |
1323 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION, | 1323 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION, |
1324 kOsAll, | 1324 kOsAll, |
1325 SINGLE_VALUE_TYPE(switches::kHistoryDisableFullHistorySync) | 1325 SINGLE_VALUE_TYPE(switches::kHistoryDisableFullHistorySync) |
1326 }, | 1326 }, |
1327 { | 1327 { |
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2420 } | 2420 } |
2421 | 2421 |
2422 const Experiment* GetExperiments(size_t* count) { | 2422 const Experiment* GetExperiments(size_t* count) { |
2423 *count = num_experiments; | 2423 *count = num_experiments; |
2424 return experiments; | 2424 return experiments; |
2425 } | 2425 } |
2426 | 2426 |
2427 } // namespace testing | 2427 } // namespace testing |
2428 | 2428 |
2429 } // namespace about_flags | 2429 } // namespace about_flags |
OLD | NEW |