| 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 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 857 }, | 857 }, |
| 858 { | 858 { |
| 859 "allow-touchpad-three-finger-swipe", | 859 "allow-touchpad-three-finger-swipe", |
| 860 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_NAME, | 860 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_NAME, |
| 861 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_DESCRIPTION, | 861 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_DESCRIPTION, |
| 862 kOsCrOS, | 862 kOsCrOS, |
| 863 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerSwipe) | 863 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerSwipe) |
| 864 }, | 864 }, |
| 865 #endif | 865 #endif |
| 866 { | 866 { |
| 867 "use-web-based-signin-flow", | 867 "use-client-login-signin-flow", |
| 868 IDS_FLAGS_USE_WEB_BASED_SIGNIN_FLOW_NAME, | 868 IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_NAME, |
| 869 IDS_FLAGS_USE_WEB_BASED_SIGNIN_FLOW_DESCRIPTION, | 869 IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_DESCRIPTION, |
| 870 kOsMac | kOsWin | kOsLinux, | 870 kOsMac | kOsWin | kOsLinux, |
| 871 SINGLE_VALUE_TYPE(switches::kUseWebBasedSigninFlow) | 871 SINGLE_VALUE_TYPE(switches::kUseClientLoginSigninFlow) |
| 872 }, | 872 }, |
| 873 #if defined(USE_ASH) | 873 #if defined(USE_ASH) |
| 874 { | 874 { |
| 875 "show-launcher-alignment-menu", | 875 "show-launcher-alignment-menu", |
| 876 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, | 876 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, |
| 877 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, | 877 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, |
| 878 kOsAll, | 878 kOsAll, |
| 879 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) | 879 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) |
| 880 }, | 880 }, |
| 881 { | 881 { |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1597 } | 1597 } |
| 1598 | 1598 |
| 1599 const Experiment* GetExperiments(size_t* count) { | 1599 const Experiment* GetExperiments(size_t* count) { |
| 1600 *count = num_experiments; | 1600 *count = num_experiments; |
| 1601 return experiments; | 1601 return experiments; |
| 1602 } | 1602 } |
| 1603 | 1603 |
| 1604 } // namespace testing | 1604 } // namespace testing |
| 1605 | 1605 |
| 1606 } // namespace about_flags | 1606 } // namespace about_flags |
| OLD | NEW |