| 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 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 switches::kDisableSupervisedUserBlacklist) | 1117 switches::kDisableSupervisedUserBlacklist) |
| 1118 }, | 1118 }, |
| 1119 { | 1119 { |
| 1120 "enable-supervised-user-safesites", | 1120 "enable-supervised-user-safesites", |
| 1121 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, | 1121 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
| 1122 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, | 1122 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
| 1123 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1123 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1124 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, | 1124 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
| 1125 switches::kDisableSupervisedUserSafeSites) | 1125 switches::kDisableSupervisedUserSafeSites) |
| 1126 }, | 1126 }, |
| 1127 { | |
| 1128 "enable-sync-synced-notifications", | |
| 1129 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | |
| 1130 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | |
| 1131 kOsDesktop, | |
| 1132 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | |
| 1133 switches::kDisableSyncSyncedNotifications) | |
| 1134 }, | |
| 1135 #if defined(ENABLE_APP_LIST) | 1127 #if defined(ENABLE_APP_LIST) |
| 1136 { | 1128 { |
| 1137 "enable-sync-app-list", | 1129 "enable-sync-app-list", |
| 1138 IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, | 1130 IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, |
| 1139 IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION, | 1131 IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION, |
| 1140 kOsDesktop, | 1132 kOsDesktop, |
| 1141 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList, | 1133 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList, |
| 1142 app_list::switches::kDisableSyncAppList) | 1134 app_list::switches::kDisableSyncAppList) |
| 1143 }, | 1135 }, |
| 1144 #endif | 1136 #endif |
| (...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2650 } | 2642 } |
| 2651 | 2643 |
| 2652 const Experiment* GetExperiments(size_t* count) { | 2644 const Experiment* GetExperiments(size_t* count) { |
| 2653 *count = num_experiments; | 2645 *count = num_experiments; |
| 2654 return experiments; | 2646 return experiments; |
| 2655 } | 2647 } |
| 2656 | 2648 |
| 2657 } // namespace testing | 2649 } // namespace testing |
| 2658 | 2650 |
| 2659 } // namespace about_flags | 2651 } // namespace about_flags |
| OLD | NEW |