| 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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 switches::kDisableNewProfileManagement)}, | 1301 switches::kDisableNewProfileManagement)}, |
| 1302 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, | 1302 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| 1303 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, | 1303 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, |
| 1304 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1304 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1305 switches::kDisableAccountConsistency)}, | 1305 switches::kDisableAccountConsistency)}, |
| 1306 {"enable-password-separated-signin-flow", | 1306 {"enable-password-separated-signin-flow", |
| 1307 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1307 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1308 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1308 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1309 kOsMac | kOsWin | kOsLinux, | 1309 kOsMac | kOsWin | kOsLinux, |
| 1310 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, | 1310 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, |
| 1311 {"show-material-design-user-menu", | |
| 1312 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_NAME, | |
| 1313 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_DESCRIPTION, | |
| 1314 kOsMac | kOsWin | kOsLinux, | |
| 1315 FEATURE_VALUE_TYPE(switches::kMaterialDesignUserMenu)}, | |
| 1316 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | 1311 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| 1317 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 1312 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 1318 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | 1313 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| 1319 #if BUILDFLAG(ENABLE_APP_LIST) | 1314 #if BUILDFLAG(ENABLE_APP_LIST) |
| 1320 {"reset-app-list-install-state", | 1315 {"reset-app-list-install-state", |
| 1321 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1316 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1322 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1317 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1323 kOsMac | kOsWin | kOsLinux, | 1318 kOsMac | kOsWin | kOsLinux, |
| 1324 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, | 1319 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, |
| 1325 #endif // BUILDFLAG(ENABLE_APP_LIST) | 1320 #endif // BUILDFLAG(ENABLE_APP_LIST) |
| (...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2529 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2524 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2530 | 2525 |
| 2531 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2526 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2532 *count = arraysize(kFeatureEntries); | 2527 *count = arraysize(kFeatureEntries); |
| 2533 return kFeatureEntries; | 2528 return kFeatureEntries; |
| 2534 } | 2529 } |
| 2535 | 2530 |
| 2536 } // namespace testing | 2531 } // namespace testing |
| 2537 | 2532 |
| 2538 } // namespace about_flags | 2533 } // namespace about_flags |
| OLD | NEW |