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 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1406 switches::kDisableNewAvatarMenu) | 1406 switches::kDisableNewAvatarMenu) |
1407 }, | 1407 }, |
1408 { | 1408 { |
1409 "enable-web-based-signin", | 1409 "enable-web-based-signin", |
1410 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, | 1410 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
1411 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, | 1411 IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
1412 kOsMac | kOsWin | kOsLinux, | 1412 kOsMac | kOsWin | kOsLinux, |
1413 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) | 1413 SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
1414 }, | 1414 }, |
1415 { | 1415 { |
1416 "enable-webview-based-signin", | 1416 "enable-iframe-based-signin", |
1417 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_NAME, | 1417 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, |
1418 IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_DESCRIPTION, | 1418 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, |
1419 kOsMac | kOsWin | kOsLinux, | 1419 kOsMac | kOsWin | kOsLinux, |
1420 SINGLE_VALUE_TYPE(switches::kEnableWebviewBasedSignin) | 1420 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin) |
1421 }, | 1421 }, |
1422 { | 1422 { |
1423 "enable-google-profile-info", | 1423 "enable-google-profile-info", |
1424 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, | 1424 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
1425 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, | 1425 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
1426 kOsMac | kOsWin | kOsLinux, | 1426 kOsMac | kOsWin | kOsLinux, |
1427 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) | 1427 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
1428 }, | 1428 }, |
1429 { | 1429 { |
1430 "reset-app-list-install-state", | 1430 "reset-app-list-install-state", |
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2677 } | 2677 } |
2678 | 2678 |
2679 const Experiment* GetExperiments(size_t* count) { | 2679 const Experiment* GetExperiments(size_t* count) { |
2680 *count = num_experiments; | 2680 *count = num_experiments; |
2681 return experiments; | 2681 return experiments; |
2682 } | 2682 } |
2683 | 2683 |
2684 } // namespace testing | 2684 } // namespace testing |
2685 | 2685 |
2686 } // namespace about_flags | 2686 } // namespace about_flags |
OLD | NEW |