| 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 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1388 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, | 1388 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| 1389 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1389 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1390 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, | 1390 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, |
| 1391 switches::kDisableNewProfileManagement)}, | 1391 switches::kDisableNewProfileManagement)}, |
| 1392 {"enable-account-consistency", | 1392 {"enable-account-consistency", |
| 1393 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, | 1393 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
| 1394 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1394 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| 1395 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1395 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1396 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1396 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1397 switches::kDisableAccountConsistency)}, | 1397 switches::kDisableAccountConsistency)}, |
| 1398 {"enable-iframe-based-signin", | |
| 1399 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | |
| 1400 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | |
| 1401 kOsMac | kOsWin | kOsLinux, | |
| 1402 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)}, | |
| 1403 {"enable-password-separated-signin-flow", | 1398 {"enable-password-separated-signin-flow", |
| 1404 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1399 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1405 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1400 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1406 kOsWin | kOsLinux, | 1401 kOsWin | kOsLinux, |
| 1407 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow, | 1402 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow, |
| 1408 switches::kDisablePasswordSeparatedSigninFlow)}, | 1403 switches::kDisablePasswordSeparatedSigninFlow)}, |
| 1409 {"enable-google-profile-info", | 1404 {"enable-google-profile-info", |
| 1410 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1405 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1411 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1406 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1412 kOsMac | kOsWin | kOsLinux, | 1407 kOsMac | kOsWin | kOsLinux, |
| (...skipping 1564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2977 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2972 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
| 2978 } | 2973 } |
| 2979 | 2974 |
| 2980 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2975 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2981 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2976 return FlagsState::GetInstance()->GetFeatureEntries(count); |
| 2982 } | 2977 } |
| 2983 | 2978 |
| 2984 } // namespace testing | 2979 } // namespace testing |
| 2985 | 2980 |
| 2986 } // namespace about_flags | 2981 } // namespace about_flags |
| OLD | NEW |