| 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 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, | 880 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, |
| 881 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, | 881 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| 882 #endif | 882 #endif |
| 883 #if defined(OS_CHROMEOS) | 883 #if defined(OS_CHROMEOS) |
| 884 {"allow-touchpad-three-finger-click", | 884 {"allow-touchpad-three-finger-click", |
| 885 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 885 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| 886 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, | 886 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, |
| 887 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, | 887 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| 888 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, | 888 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| 889 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, | 889 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, |
| 890 SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)}, | 890 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, |
| 891 {"enable-easy-unlock-proximity-detection", | 891 {"enable-easy-unlock-proximity-detection", |
| 892 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, | 892 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| 893 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, | 893 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, |
| 894 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, | 894 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, |
| 895 {"enable-easy-unlock-bluetooth-low-energy-detection", | 895 {"enable-easy-unlock-bluetooth-low-energy-detection", |
| 896 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, | 896 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, |
| 897 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, | 897 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, |
| 898 SINGLE_VALUE_TYPE( | 898 SINGLE_VALUE_TYPE( |
| 899 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, | 899 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, |
| 900 #endif | 900 #endif |
| (...skipping 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2250 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2250 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2251 | 2251 |
| 2252 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2252 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2253 *count = arraysize(kFeatureEntries); | 2253 *count = arraysize(kFeatureEntries); |
| 2254 return kFeatureEntries; | 2254 return kFeatureEntries; |
| 2255 } | 2255 } |
| 2256 | 2256 |
| 2257 } // namespace testing | 2257 } // namespace testing |
| 2258 | 2258 |
| 2259 } // namespace about_flags | 2259 } // namespace about_flags |
| OLD | NEW |