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 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1409 }, | 1409 }, |
1410 { | 1410 { |
1411 "enable-new-avatar-menu", | 1411 "enable-new-avatar-menu", |
1412 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, | 1412 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
1413 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, | 1413 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
1414 kOsMac | kOsWin | kOsLinux, | 1414 kOsMac | kOsWin | kOsLinux, |
1415 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, | 1415 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
1416 switches::kDisableNewAvatarMenu) | 1416 switches::kDisableNewAvatarMenu) |
1417 }, | 1417 }, |
1418 { | 1418 { |
1419 "enable-web-based-signin", | |
1420 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | |
1421 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | |
1422 kOsMac | kOsWin | kOsLinux, | |
1423 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | |
1424 }, | |
1425 { | |
1426 "enable-iframe-based-signin", | 1419 "enable-iframe-based-signin", |
1427 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, | 1420 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
1428 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, | 1421 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
1429 kOsMac | kOsWin | kOsLinux, | 1422 kOsMac | kOsWin | kOsLinux, |
1430 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) | 1423 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
1431 }, | 1424 }, |
1432 { | 1425 { |
1433 "enable-google-profile-info", | 1426 "enable-google-profile-info", |
1434 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1427 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
1435 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1428 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2727 } | 2720 } |
2728 | 2721 |
2729 const Experiment* GetExperiments(size_t* count) { | 2722 const Experiment* GetExperiments(size_t* count) { |
2730 *count = num_experiments; | 2723 *count = num_experiments; |
2731 return experiments; | 2724 return experiments; |
2732 } | 2725 } |
2733 | 2726 |
2734 } // namespace testing | 2727 } // namespace testing |
2735 | 2728 |
2736 } // namespace about_flags | 2729 } // namespace about_flags |
OLD | NEW |