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