| 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 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1691 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) | 1691 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) |
| 1692 }, | 1692 }, |
| 1693 { | 1693 { |
| 1694 "enable-new-profile-management", | 1694 "enable-new-profile-management", |
| 1695 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, | 1695 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, |
| 1696 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, | 1696 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| 1697 kOsMac | kOsWin | kOsLinux, | 1697 kOsMac | kOsWin | kOsLinux, |
| 1698 SINGLE_VALUE_TYPE(switches::kNewProfileManagement) | 1698 SINGLE_VALUE_TYPE(switches::kNewProfileManagement) |
| 1699 }, | 1699 }, |
| 1700 { | 1700 { |
| 1701 "enable-inline-signin", | 1701 "enable-web-based-signin", |
| 1702 IDS_FLAGS_ENABLE_INLINE_SIGNIN_NAME, | 1702 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| 1703 IDS_FLAGS_ENABLE_INLINE_SIGNIN_DESCRIPTION, | 1703 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| 1704 kOsMac | kOsWin | kOsLinux, | 1704 kOsMac | kOsWin | kOsLinux, |
| 1705 SINGLE_VALUE_TYPE(switches::kEnableInlineSignin) | 1705 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
| 1706 }, | 1706 }, |
| 1707 { | 1707 { |
| 1708 "enable-google-profile-info", | 1708 "enable-google-profile-info", |
| 1709 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1709 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1710 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1710 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1711 kOsMac | kOsWin | kOsLinux, | 1711 kOsMac | kOsWin | kOsLinux, |
| 1712 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) | 1712 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
| 1713 }, | 1713 }, |
| 1714 { | 1714 { |
| 1715 "disable-app-launcher", | 1715 "disable-app-launcher", |
| (...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2454 } | 2454 } |
| 2455 | 2455 |
| 2456 const Experiment* GetExperiments(size_t* count) { | 2456 const Experiment* GetExperiments(size_t* count) { |
| 2457 *count = num_experiments; | 2457 *count = num_experiments; |
| 2458 return experiments; | 2458 return experiments; |
| 2459 } | 2459 } |
| 2460 | 2460 |
| 2461 } // namespace testing | 2461 } // namespace testing |
| 2462 | 2462 |
| 2463 } // namespace about_flags | 2463 } // namespace about_flags |
| OLD | NEW |