| 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 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1439 switches::kDisableNewAvatarMenu) | 1439 switches::kDisableNewAvatarMenu) |
| 1440 }, | 1440 }, |
| 1441 { | 1441 { |
| 1442 "enable-web-based-signin", | 1442 "enable-web-based-signin", |
| 1443 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | 1443 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| 1444 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | 1444 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| 1445 kOsMac | kOsWin | kOsLinux, | 1445 kOsMac | kOsWin | kOsLinux, |
| 1446 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | 1446 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
| 1447 }, | 1447 }, |
| 1448 { | 1448 { |
| 1449 "enable-webview-based-signin", |
| 1450 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_NAME, |
| 1451 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_DESCRIPTION, |
| 1452 kOsMac | kOsWin | kOsLinux, |
| 1453 SINGLE_VALUE_TYPE(switches::kEnableWebviewBasedSignin) |
| 1454 }, |
| 1455 { |
| 1449 "enable-google-profile-info", | 1456 "enable-google-profile-info", |
| 1450 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1457 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1451 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1458 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1452 kOsMac | kOsWin | kOsLinux, | 1459 kOsMac | kOsWin | kOsLinux, |
| 1453 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) | 1460 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
| 1454 }, | 1461 }, |
| 1455 { | 1462 { |
| 1456 "reset-app-list-install-state", | 1463 "reset-app-list-install-state", |
| 1457 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1464 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1458 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1465 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| (...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2550 } | 2557 } |
| 2551 | 2558 |
| 2552 const Experiment* GetExperiments(size_t* count) { | 2559 const Experiment* GetExperiments(size_t* count) { |
| 2553 *count = num_experiments; | 2560 *count = num_experiments; |
| 2554 return experiments; | 2561 return experiments; |
| 2555 } | 2562 } |
| 2556 | 2563 |
| 2557 } // namespace testing | 2564 } // namespace testing |
| 2558 | 2565 |
| 2559 } // namespace about_flags | 2566 } // namespace about_flags |
| OLD | NEW |