| 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 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1317 switches::kDisableNewProfileManagement)}, | 1317 switches::kDisableNewProfileManagement)}, |
| 1318 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, | 1318 {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| 1319 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, | 1319 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll, |
| 1320 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1320 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1321 switches::kDisableAccountConsistency)}, | 1321 switches::kDisableAccountConsistency)}, |
| 1322 {"enable-password-separated-signin-flow", | 1322 {"enable-password-separated-signin-flow", |
| 1323 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1323 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1324 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1324 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1325 kOsMac | kOsWin | kOsLinux, | 1325 kOsMac | kOsWin | kOsLinux, |
| 1326 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, | 1326 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, |
| 1327 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | |
| 1328 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | |
| 1329 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | |
| 1330 #if BUILDFLAG(ENABLE_APP_LIST) | 1327 #if BUILDFLAG(ENABLE_APP_LIST) |
| 1331 {"reset-app-list-install-state", | 1328 {"reset-app-list-install-state", |
| 1332 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1329 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1333 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1330 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1334 kOsMac | kOsWin | kOsLinux, | 1331 kOsMac | kOsWin | kOsLinux, |
| 1335 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, | 1332 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, |
| 1336 #endif // BUILDFLAG(ENABLE_APP_LIST) | 1333 #endif // BUILDFLAG(ENABLE_APP_LIST) |
| 1337 #if defined(OS_ANDROID) | 1334 #if defined(OS_ANDROID) |
| 1338 {"enable-special-locale", IDS_FLAGS_ENABLE_SPECIAL_LOCALE_NAME, | 1335 {"enable-special-locale", IDS_FLAGS_ENABLE_SPECIAL_LOCALE_NAME, |
| 1339 IDS_FLAGS_ENABLE_SPECIAL_LOCALE_DESCRIPTION, kOsAndroid, | 1336 IDS_FLAGS_ENABLE_SPECIAL_LOCALE_DESCRIPTION, kOsAndroid, |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2550 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2547 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2551 | 2548 |
| 2552 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2549 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2553 *count = arraysize(kFeatureEntries); | 2550 *count = arraysize(kFeatureEntries); |
| 2554 return kFeatureEntries; | 2551 return kFeatureEntries; |
| 2555 } | 2552 } |
| 2556 | 2553 |
| 2557 } // namespace testing | 2554 } // namespace testing |
| 2558 | 2555 |
| 2559 } // namespace about_flags | 2556 } // namespace about_flags |
| OLD | NEW |