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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1149 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, | 1149 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
1150 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1150 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, |
1151 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1151 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1152 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1152 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
1153 switches::kDisableAccountConsistency)}, | 1153 switches::kDisableAccountConsistency)}, |
1154 {"enable-password-separated-signin-flow", | 1154 {"enable-password-separated-signin-flow", |
1155 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1155 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
1156 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1156 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
1157 kOsMac | kOsWin | kOsLinux, | 1157 kOsMac | kOsWin | kOsLinux, |
1158 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, | 1158 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, |
| 1159 {"enable-material-design-user-manager", |
| 1160 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_NAME, |
| 1161 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_DESCRIPTION, |
| 1162 kOsMac | kOsWin | kOsLinux, |
| 1163 FEATURE_VALUE_TYPE(switches::kMDUserManager)}, |
1159 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | 1164 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
1160 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 1165 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
1161 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | 1166 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
1162 #if defined(ENABLE_APP_LIST) | 1167 #if defined(ENABLE_APP_LIST) |
1163 {"reset-app-list-install-state", | 1168 {"reset-app-list-install-state", |
1164 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1169 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
1165 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1170 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
1166 kOsMac | kOsWin | kOsLinux, | 1171 kOsMac | kOsWin | kOsLinux, |
1167 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, | 1172 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, |
1168 #endif | 1173 #endif |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2015 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2020 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2016 | 2021 |
2017 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2022 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2018 *count = arraysize(kFeatureEntries); | 2023 *count = arraysize(kFeatureEntries); |
2019 return kFeatureEntries; | 2024 return kFeatureEntries; |
2020 } | 2025 } |
2021 | 2026 |
2022 } // namespace testing | 2027 } // namespace testing |
2023 | 2028 |
2024 } // namespace about_flags | 2029 } // namespace about_flags |
OLD | NEW |