| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1723 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) | 1723 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) |
| 1724 }, | 1724 }, |
| 1725 { | 1725 { |
| 1726 "enable-new-profile-management", | 1726 "enable-new-profile-management", |
| 1727 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, | 1727 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, |
| 1728 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, | 1728 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| 1729 kOsMac | kOsWin | kOsLinux, | 1729 kOsMac | kOsWin | kOsLinux, |
| 1730 SINGLE_VALUE_TYPE(switches::kNewProfileManagement) | 1730 SINGLE_VALUE_TYPE(switches::kNewProfileManagement) |
| 1731 }, | 1731 }, |
| 1732 { | 1732 { |
| 1733 "enable-inline-signin", | 1733 "enable-web-based-signin", |
| 1734 IDS_FLAGS_ENABLE_INLINE_SIGNIN_NAME, | 1734 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| 1735 IDS_FLAGS_ENABLE_INLINE_SIGNIN_DESCRIPTION, | 1735 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| 1736 kOsMac | kOsWin | kOsLinux, | 1736 kOsMac | kOsWin | kOsLinux, |
| 1737 SINGLE_VALUE_TYPE(switches::kEnableInlineSignin) | 1737 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
| 1738 }, | 1738 }, |
| 1739 { | 1739 { |
| 1740 "enable-google-profile-info", | 1740 "enable-google-profile-info", |
| 1741 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1741 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1742 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1742 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1743 kOsMac | kOsWin | kOsLinux, | 1743 kOsMac | kOsWin | kOsLinux, |
| 1744 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) | 1744 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
| 1745 }, | 1745 }, |
| 1746 { | 1746 { |
| 1747 "disable-app-launcher", | 1747 "disable-app-launcher", |
| (...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2479 } | 2479 } |
| 2480 | 2480 |
| 2481 const Experiment* GetExperiments(size_t* count) { | 2481 const Experiment* GetExperiments(size_t* count) { |
| 2482 *count = num_experiments; | 2482 *count = num_experiments; |
| 2483 return experiments; | 2483 return experiments; |
| 2484 } | 2484 } |
| 2485 | 2485 |
| 2486 } // namespace testing | 2486 } // namespace testing |
| 2487 | 2487 |
| 2488 } // namespace about_flags | 2488 } // namespace about_flags |
| OLD | NEW |