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 1543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1554 switches::kDisableAccountConsistency) | 1554 switches::kDisableAccountConsistency) |
1555 }, | 1555 }, |
1556 { | 1556 { |
1557 "enable-fast-user-switching", | 1557 "enable-fast-user-switching", |
1558 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, | 1558 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, |
1559 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, | 1559 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, |
1560 kOsMac | kOsWin | kOsLinux, | 1560 kOsMac | kOsWin | kOsLinux, |
1561 SINGLE_VALUE_TYPE(switches::kFastUserSwitching) | 1561 SINGLE_VALUE_TYPE(switches::kFastUserSwitching) |
1562 }, | 1562 }, |
1563 { | 1563 { |
1564 "enable-new-avatar-menu", | |
msw
2015/05/18 18:28:30
Can you take a look at the remaining mentions of t
anthonyvd
2015/05/19 22:56:41
We appear to still be using those resources in oth
| |
1565 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | |
msw
2015/05/18 18:28:30
Remove these string resources.
anthonyvd
2015/05/19 22:56:41
Good point, done.
| |
1566 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | |
1567 kOsMac | kOsWin | kOsLinux, | |
1568 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | |
1569 switches::kDisableNewAvatarMenu) | |
1570 }, | |
1571 { | |
1572 "enable-iframe-based-signin", | 1564 "enable-iframe-based-signin", |
1573 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1565 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
1574 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1566 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
1575 kOsMac | kOsWin | kOsLinux, | 1567 kOsMac | kOsWin | kOsLinux, |
1576 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) | 1568 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
1577 }, | 1569 }, |
1578 { | 1570 { |
1579 "enable-google-profile-info", | 1571 "enable-google-profile-info", |
1580 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1572 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
1581 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1573 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3014 } | 3006 } |
3015 | 3007 |
3016 const Experiment* GetExperiments(size_t* count) { | 3008 const Experiment* GetExperiments(size_t* count) { |
3017 *count = num_experiments; | 3009 *count = num_experiments; |
3018 return experiments; | 3010 return experiments; |
3019 } | 3011 } |
3020 | 3012 |
3021 } // namespace testing | 3013 } // namespace testing |
3022 | 3014 |
3023 } // namespace about_flags | 3015 } // namespace about_flags |
OLD | NEW |