| 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 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1396 switches::kDisableNewAvatarMenu) | 1396 switches::kDisableNewAvatarMenu) |
| 1397 }, | 1397 }, |
| 1398 { | 1398 { |
| 1399 "enable-web-based-signin", | 1399 "enable-web-based-signin", |
| 1400 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | 1400 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| 1401 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | 1401 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| 1402 kOsMac | kOsWin | kOsLinux, | 1402 kOsMac | kOsWin | kOsLinux, |
| 1403 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | 1403 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
| 1404 }, | 1404 }, |
| 1405 { | 1405 { |
| 1406 "enable-webview-based-signin", | 1406 "enable-iframe-based-signin", |
| 1407 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_NAME, | 1407 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
| 1408 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_DESCRIPTION, | 1408 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
| 1409 kOsMac | kOsWin | kOsLinux, | 1409 kOsMac | kOsWin | kOsLinux, |
| 1410 SINGLE_VALUE_TYPE(switches::kEnableWebviewBasedSignin) | 1410 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
| 1411 }, | 1411 }, |
| 1412 { | 1412 { |
| 1413 "enable-google-profile-info", | 1413 "enable-google-profile-info", |
| 1414 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1414 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| 1415 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1415 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| 1416 kOsMac | kOsWin | kOsLinux, | 1416 kOsMac | kOsWin | kOsLinux, |
| 1417 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) | 1417 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
| 1418 }, | 1418 }, |
| 1419 { | 1419 { |
| 1420 "reset-app-list-install-state", | 1420 "reset-app-list-install-state", |
| (...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2626 } | 2626 } |
| 2627 | 2627 |
| 2628 const Experiment* GetExperiments(size_t* count) { | 2628 const Experiment* GetExperiments(size_t* count) { |
| 2629 *count = num_experiments; | 2629 *count = num_experiments; |
| 2630 return experiments; | 2630 return experiments; |
| 2631 } | 2631 } |
| 2632 | 2632 |
| 2633 } // namespace testing | 2633 } // namespace testing |
| 2634 | 2634 |
| 2635 } // namespace about_flags | 2635 } // namespace about_flags |
| OLD | NEW |