Chromium Code Reviews| 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 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1361 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, | 1361 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
| 1362 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1362 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| 1363 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1363 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1364 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1364 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1365 switches::kDisableAccountConsistency)}, | 1365 switches::kDisableAccountConsistency)}, |
| 1366 {"enable-iframe-based-signin", | 1366 {"enable-iframe-based-signin", |
| 1367 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1367 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
| 1368 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1368 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
| 1369 kOsMac | kOsWin | kOsLinux, | 1369 kOsMac | kOsWin | kOsLinux, |
| 1370 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)}, | 1370 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)}, |
| 1371 {"enable-new-gaia-signin-flow", | |
| 1372 IDS_FLAGS_ENABLE_NEW_GAIA_SIGNIN_FLOW_NAME, | |
| 1373 IDS_FLAGS_ENABLE_NEW_GAIA_SIGNIN_FLOW_DESCRIPTION, | |
| 1374 kOsWin | kOsLinux, | |
|
anthonyvd
2015/09/15 18:13:47
No Mac because this only includes the views implem
Roger Tawa OOO till Jul 10th
2015/09/16 19:27:29
Correct.
| |
| 1375 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewGaiaSigninFlow, | |
| 1376 switches::kDisableNewGaiaSigninFlow)}, | |
| 1371 {"enable-google-profile-info", | 1377 {"enable-google-profile-info", |
| 1372 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1378 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1373 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1379 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1374 kOsMac | kOsWin | kOsLinux, | 1380 kOsMac | kOsWin | kOsLinux, |
| 1375 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | 1381 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| 1376 #if defined(ENABLE_APP_LIST) | 1382 #if defined(ENABLE_APP_LIST) |
| 1377 {"reset-app-list-install-state", | 1383 {"reset-app-list-install-state", |
| 1378 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1384 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1379 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1385 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1380 kOsMac | kOsWin | kOsLinux, | 1386 kOsMac | kOsWin | kOsLinux, |
| (...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2716 } | 2722 } |
| 2717 | 2723 |
| 2718 const Experiment* GetExperiments(size_t* count) { | 2724 const Experiment* GetExperiments(size_t* count) { |
| 2719 *count = num_experiments; | 2725 *count = num_experiments; |
| 2720 return experiments; | 2726 return experiments; |
| 2721 } | 2727 } |
| 2722 | 2728 |
| 2723 } // namespace testing | 2729 } // namespace testing |
| 2724 | 2730 |
| 2725 } // namespace about_flags | 2731 } // namespace about_flags |
| OLD | NEW |