| 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 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1419 }, | 1419 }, |
| 1420 { | 1420 { |
| 1421 "enable-new-avatar-menu", | 1421 "enable-new-avatar-menu", |
| 1422 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | 1422 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
| 1423 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | 1423 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
| 1424 kOsMac | kOsWin | kOsLinux, | 1424 kOsMac | kOsWin | kOsLinux, |
| 1425 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | 1425 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
| 1426 switches::kDisableNewAvatarMenu) | 1426 switches::kDisableNewAvatarMenu) |
| 1427 }, | 1427 }, |
| 1428 { | 1428 { |
| 1429 "enable-web-based-signin", | |
| 1430 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | |
| 1431 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | |
| 1432 kOsMac | kOsWin | kOsLinux, | |
| 1433 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | |
| 1434 }, | |
| 1435 { | |
| 1436 "enable-iframe-based-signin", | 1429 "enable-iframe-based-signin", |
| 1437 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1430 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
| 1438 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1431 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
| 1439 kOsMac | kOsWin | kOsLinux, | 1432 kOsMac | kOsWin | kOsLinux, |
| 1440 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) | 1433 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
| 1441 }, | 1434 }, |
| 1442 { | 1435 { |
| 1443 "enable-google-profile-info", | 1436 "enable-google-profile-info", |
| 1444 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1437 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1445 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1438 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| (...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2746 } | 2739 } |
| 2747 | 2740 |
| 2748 const Experiment* GetExperiments(size_t* count) { | 2741 const Experiment* GetExperiments(size_t* count) { |
| 2749 *count = num_experiments; | 2742 *count = num_experiments; |
| 2750 return experiments; | 2743 return experiments; |
| 2751 } | 2744 } |
| 2752 | 2745 |
| 2753 } // namespace testing | 2746 } // namespace testing |
| 2754 | 2747 |
| 2755 } // namespace about_flags | 2748 } // namespace about_flags |
| OLD | NEW |