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