| 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 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 switches::kDisableNewProfileManagement)}, | 1284 switches::kDisableNewProfileManagement)}, |
| 1285 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, | 1285 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| 1286 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, | 1286 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, |
| 1287 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1287 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1288 switches::kDisableAccountConsistency)}, | 1288 switches::kDisableAccountConsistency)}, |
| 1289 {"enable-password-separated-signin-flow", | 1289 {"enable-password-separated-signin-flow", |
| 1290 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1290 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1291 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1291 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1292 kOsMac | kOsWin | kOsLinux, | 1292 kOsMac | kOsWin | kOsLinux, |
| 1293 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, | 1293 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, |
| 1294 {"show-material-design-user-menu", | |
| 1295 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_NAME, | |
| 1296 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_DESCRIPTION, | |
| 1297 kOsMac | kOsWin | kOsLinux, | |
| 1298 FEATURE_VALUE_TYPE(switches::kMaterialDesignUserMenu)}, | |
| 1299 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | 1294 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| 1300 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 1295 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 1301 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | 1296 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| 1302 #if BUILDFLAG(ENABLE_APP_LIST) | 1297 #if BUILDFLAG(ENABLE_APP_LIST) |
| 1303 {"reset-app-list-install-state", | 1298 {"reset-app-list-install-state", |
| 1304 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1299 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1305 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1300 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1306 kOsMac | kOsWin | kOsLinux, | 1301 kOsMac | kOsWin | kOsLinux, |
| 1307 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, | 1302 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, |
| 1308 #endif // BUILDFLAG(ENABLE_APP_LIST) | 1303 #endif // BUILDFLAG(ENABLE_APP_LIST) |
| (...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2486 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2481 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2487 | 2482 |
| 2488 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2483 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2489 *count = arraysize(kFeatureEntries); | 2484 *count = arraysize(kFeatureEntries); |
| 2490 return kFeatureEntries; | 2485 return kFeatureEntries; |
| 2491 } | 2486 } |
| 2492 | 2487 |
| 2493 } // namespace testing | 2488 } // namespace testing |
| 2494 | 2489 |
| 2495 } // namespace about_flags | 2490 } // namespace about_flags |
| OLD | NEW |