| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 }, | 855 }, |
| 856 { | 856 { |
| 857 "allow-touchpad-three-finger-swipe", | 857 "allow-touchpad-three-finger-swipe", |
| 858 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_NAME, | 858 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_NAME, |
| 859 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_DESCRIPTION, | 859 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_DESCRIPTION, |
| 860 kOsCrOS, | 860 kOsCrOS, |
| 861 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerSwipe) | 861 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerSwipe) |
| 862 }, | 862 }, |
| 863 #endif | 863 #endif |
| 864 { | 864 { |
| 865 "use-web-based-signin-flow", | 865 "use-client-login-signin-flow", |
| 866 IDS_FLAGS_USE_WEB_BASED_SIGNIN_FLOW_NAME, | 866 IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_NAME, |
| 867 IDS_FLAGS_USE_WEB_BASED_SIGNIN_FLOW_DESCRIPTION, | 867 IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_DESCRIPTION, |
| 868 kOsMac | kOsWin | kOsLinux, | 868 kOsMac | kOsWin | kOsLinux, |
| 869 SINGLE_VALUE_TYPE(switches::kUseWebBasedSigninFlow) | 869 SINGLE_VALUE_TYPE(switches::kUseClientLoginSigninFlow) |
| 870 }, | 870 }, |
| 871 { | 871 { |
| 872 "enable-desktop-guest-mode", | 872 "enable-desktop-guest-mode", |
| 873 IDS_FLAGS_DESKTOP_GUEST_MODE_NAME, | 873 IDS_FLAGS_DESKTOP_GUEST_MODE_NAME, |
| 874 IDS_FLAGS_DESKTOP_GUEST_MODE_DESCRIPTION, | 874 IDS_FLAGS_DESKTOP_GUEST_MODE_DESCRIPTION, |
| 875 kOsMac | kOsWin | kOsLinux, | 875 kOsMac | kOsWin | kOsLinux, |
| 876 SINGLE_VALUE_TYPE(switches::kEnableDesktopGuestMode) | 876 SINGLE_VALUE_TYPE(switches::kEnableDesktopGuestMode) |
| 877 }, | 877 }, |
| 878 #if defined(USE_ASH) | 878 #if defined(USE_ASH) |
| 879 { | 879 { |
| (...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1602 } | 1602 } |
| 1603 | 1603 |
| 1604 const Experiment* GetExperiments(size_t* count) { | 1604 const Experiment* GetExperiments(size_t* count) { |
| 1605 *count = num_experiments; | 1605 *count = num_experiments; |
| 1606 return experiments; | 1606 return experiments; |
| 1607 } | 1607 } |
| 1608 | 1608 |
| 1609 } // namespace testing | 1609 } // namespace testing |
| 1610 | 1610 |
| 1611 } // namespace about_flags | 1611 } // namespace about_flags |
| OLD | NEW |