| 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 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1428 }, | 1428 }, |
| 1429 { | 1429 { |
| 1430 "enable-new-avatar-menu", | 1430 "enable-new-avatar-menu", |
| 1431 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | 1431 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
| 1432 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | 1432 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
| 1433 kOsMac | kOsWin | kOsLinux, | 1433 kOsMac | kOsWin | kOsLinux, |
| 1434 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | 1434 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
| 1435 switches::kDisableNewAvatarMenu) | 1435 switches::kDisableNewAvatarMenu) |
| 1436 }, | 1436 }, |
| 1437 { | 1437 { |
| 1438 "enable-web-based-signin", | |
| 1439 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | |
| 1440 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | |
| 1441 kOsMac | kOsWin | kOsLinux, | |
| 1442 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | |
| 1443 }, | |
| 1444 { | |
| 1445 "enable-iframe-based-signin", | 1438 "enable-iframe-based-signin", |
| 1446 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1439 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
| 1447 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1440 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
| 1448 kOsMac | kOsWin | kOsLinux, | 1441 kOsMac | kOsWin | kOsLinux, |
| 1449 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) | 1442 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
| 1450 }, | 1443 }, |
| 1451 { | 1444 { |
| 1452 "enable-google-profile-info", | 1445 "enable-google-profile-info", |
| 1453 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1446 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1454 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1447 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| (...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2796 } | 2789 } |
| 2797 | 2790 |
| 2798 const Experiment* GetExperiments(size_t* count) { | 2791 const Experiment* GetExperiments(size_t* count) { |
| 2799 *count = num_experiments; | 2792 *count = num_experiments; |
| 2800 return experiments; | 2793 return experiments; |
| 2801 } | 2794 } |
| 2802 | 2795 |
| 2803 } // namespace testing | 2796 } // namespace testing |
| 2804 | 2797 |
| 2805 } // namespace about_flags | 2798 } // namespace about_flags |
| OLD | NEW |