| 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 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1283 IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION, | 1283 IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| 1284 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1284 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1285 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, | 1285 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, |
| 1286 switches::kDisableNewProfileManagement)}, | 1286 switches::kDisableNewProfileManagement)}, |
| 1287 {"enable-account-consistency", | 1287 {"enable-account-consistency", |
| 1288 IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, | 1288 IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| 1289 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1289 IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| 1290 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1290 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1291 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1291 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1292 switches::kDisableAccountConsistency)}, | 1292 switches::kDisableAccountConsistency)}, |
| 1293 {"enable-iframe-based-signin", | |
| 1294 IDS_FLAGS_IFRAME_BASED_SIGNIN_NAME, | |
| 1295 IDS_FLAGS_IFRAME_BASED_SIGNIN_DESCRIPTION, | |
| 1296 kOsMac | kOsWin | kOsLinux, | |
| 1297 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)}, | |
| 1298 {"enable-password-separated-signin-flow", | 1293 {"enable-password-separated-signin-flow", |
| 1299 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1294 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1300 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1295 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1301 kOsWin | kOsLinux, | 1296 kOsWin | kOsLinux, |
| 1302 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow, | 1297 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow, |
| 1303 switches::kDisablePasswordSeparatedSigninFlow)}, | 1298 switches::kDisablePasswordSeparatedSigninFlow)}, |
| 1304 {"enable-google-profile-info", | 1299 {"enable-google-profile-info", |
| 1305 IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | 1300 IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| 1306 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1301 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1307 kOsMac | kOsWin | kOsLinux, | 1302 kOsMac | kOsWin | kOsLinux, |
| (...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2280 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2275 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2281 | 2276 |
| 2282 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2277 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2283 *count = arraysize(kFeatureEntries); | 2278 *count = arraysize(kFeatureEntries); |
| 2284 return kFeatureEntries; | 2279 return kFeatureEntries; |
| 2285 } | 2280 } |
| 2286 | 2281 |
| 2287 } // namespace testing | 2282 } // namespace testing |
| 2288 | 2283 |
| 2289 } // namespace about_flags | 2284 } // namespace about_flags |
| OLD | NEW |