| 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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 928 kOsCrOS, | 928 kOsCrOS, |
| 929 SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock) | 929 SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock) |
| 930 }, | 930 }, |
| 931 { | 931 { |
| 932 "enable-easy-unlock-proximity-detection", | 932 "enable-easy-unlock-proximity-detection", |
| 933 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, | 933 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| 934 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, | 934 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, |
| 935 kOsCrOS, | 935 kOsCrOS, |
| 936 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection) | 936 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection) |
| 937 }, | 937 }, |
| 938 { |
| 939 "enable-easy-unlock-bluetooth-low-energy-detection", |
| 940 IDS_FLAGS_ENABLE_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, |
| 941 IDS_FLAGS_ENABLE_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, |
| 942 kOsCrOS, |
| 943 SINGLE_VALUE_TYPE( |
| 944 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery) |
| 945 }, |
| 938 #endif | 946 #endif |
| 939 #if defined(USE_ASH) | 947 #if defined(USE_ASH) |
| 940 { | 948 { |
| 941 "disable-minimize-on-second-launcher-item-click", | 949 "disable-minimize-on-second-launcher-item-click", |
| 942 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 950 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| 943 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 951 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| 944 kOsAll, | 952 kOsAll, |
| 945 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 953 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| 946 }, | 954 }, |
| 947 { | 955 { |
| (...skipping 1983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2931 } | 2939 } |
| 2932 | 2940 |
| 2933 const Experiment* GetExperiments(size_t* count) { | 2941 const Experiment* GetExperiments(size_t* count) { |
| 2934 *count = num_experiments; | 2942 *count = num_experiments; |
| 2935 return experiments; | 2943 return experiments; |
| 2936 } | 2944 } |
| 2937 | 2945 |
| 2938 } // namespace testing | 2946 } // namespace testing |
| 2939 | 2947 |
| 2940 } // namespace about_flags | 2948 } // namespace about_flags |
| OLD | NEW |