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