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 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
931 }, | 931 }, |
932 #endif | 932 #endif |
933 #if defined(OS_CHROMEOS) | 933 #if defined(OS_CHROMEOS) |
934 { | 934 { |
935 "allow-touchpad-three-finger-click", | 935 "allow-touchpad-three-finger-click", |
936 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 936 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
937 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, | 937 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, |
938 kOsCrOS, | 938 kOsCrOS, |
939 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) | 939 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) |
940 }, | 940 }, |
| 941 { |
| 942 "enable-easy-signin", |
| 943 IDS_FLAGS_ENABLE_EASY_SIGNIN_NAME, |
| 944 IDS_FLAGS_ENABLE_EASY_SIGNIN_DESCRIPTION, |
| 945 kOsCrOSOwnerOnly, |
| 946 SINGLE_VALUE_TYPE(chromeos::switches::kEnableEasySignin), |
| 947 }, |
941 #endif | 948 #endif |
942 #if defined(USE_ASH) | 949 #if defined(USE_ASH) |
943 { | 950 { |
944 "disable-minimize-on-second-launcher-item-click", | 951 "disable-minimize-on-second-launcher-item-click", |
945 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 952 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
946 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 953 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
947 kOsAll, | 954 kOsAll, |
948 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 955 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
949 }, | 956 }, |
950 { | 957 { |
(...skipping 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2470 } | 2477 } |
2471 | 2478 |
2472 const Experiment* GetExperiments(size_t* count) { | 2479 const Experiment* GetExperiments(size_t* count) { |
2473 *count = num_experiments; | 2480 *count = num_experiments; |
2474 return experiments; | 2481 return experiments; |
2475 } | 2482 } |
2476 | 2483 |
2477 } // namespace testing | 2484 } // namespace testing |
2478 | 2485 |
2479 } // namespace about_flags | 2486 } // namespace about_flags |
OLD | NEW |