| 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 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1570 }, | 1570 }, |
| 1571 { | 1571 { |
| 1572 "enable-account-consistency", | 1572 "enable-account-consistency", |
| 1573 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, | 1573 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
| 1574 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1574 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| 1575 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1575 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1576 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1576 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| 1577 switches::kDisableAccountConsistency) | 1577 switches::kDisableAccountConsistency) |
| 1578 }, | 1578 }, |
| 1579 { | 1579 { |
| 1580 "enable-fast-user-switching", | |
| 1581 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, | |
| 1582 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, | |
| 1583 kOsMac | kOsWin | kOsLinux, | |
| 1584 SINGLE_VALUE_TYPE(switches::kFastUserSwitching) | |
| 1585 }, | |
| 1586 { | |
| 1587 "enable-new-avatar-menu", | 1580 "enable-new-avatar-menu", |
| 1588 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | 1581 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
| 1589 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | 1582 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
| 1590 kOsMac | kOsWin | kOsLinux, | 1583 kOsMac | kOsWin | kOsLinux, |
| 1591 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | 1584 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
| 1592 switches::kDisableNewAvatarMenu) | 1585 switches::kDisableNewAvatarMenu) |
| 1593 }, | 1586 }, |
| 1594 { | 1587 { |
| 1595 "enable-iframe-based-signin", | 1588 "enable-iframe-based-signin", |
| 1596 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1589 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
| (...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3017 } | 3010 } |
| 3018 | 3011 |
| 3019 const Experiment* GetExperiments(size_t* count) { | 3012 const Experiment* GetExperiments(size_t* count) { |
| 3020 *count = num_experiments; | 3013 *count = num_experiments; |
| 3021 return experiments; | 3014 return experiments; |
| 3022 } | 3015 } |
| 3023 | 3016 |
| 3024 } // namespace testing | 3017 } // namespace testing |
| 3025 | 3018 |
| 3026 } // namespace about_flags | 3019 } // namespace about_flags |
| OLD | NEW |