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 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 }, | 1548 }, |
1549 { | 1549 { |
1550 "enable-account-consistency", | 1550 "enable-account-consistency", |
1551 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, | 1551 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
1552 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, | 1552 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
1553 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1553 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1554 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, | 1554 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
1555 switches::kDisableAccountConsistency) | 1555 switches::kDisableAccountConsistency) |
1556 }, | 1556 }, |
1557 { | 1557 { |
1558 "enable-new-avatar-menu", | |
1559 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | |
1560 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | |
1561 kOsMac | kOsWin | kOsLinux, | |
1562 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | |
1563 switches::kDisableNewAvatarMenu) | |
1564 }, | |
1565 { | |
1566 "enable-iframe-based-signin", | 1558 "enable-iframe-based-signin", |
1567 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1559 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
1568 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1560 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
1569 kOsMac | kOsWin | kOsLinux, | 1561 kOsMac | kOsWin | kOsLinux, |
1570 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) | 1562 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
1571 }, | 1563 }, |
1572 { | 1564 { |
1573 "enable-google-profile-info", | 1565 "enable-google-profile-info", |
1574 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1566 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
1575 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1567 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3009 } | 3001 } |
3010 | 3002 |
3011 const Experiment* GetExperiments(size_t* count) { | 3003 const Experiment* GetExperiments(size_t* count) { |
3012 *count = num_experiments; | 3004 *count = num_experiments; |
3013 return experiments; | 3005 return experiments; |
3014 } | 3006 } |
3015 | 3007 |
3016 } // namespace testing | 3008 } // namespace testing |
3017 | 3009 |
3018 } // namespace about_flags | 3010 } // namespace about_flags |
OLD | NEW |