| 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 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, | 875 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| 876 #endif | 876 #endif |
| 877 #if defined(OS_CHROMEOS) | 877 #if defined(OS_CHROMEOS) |
| 878 {"allow-touchpad-three-finger-click", | 878 {"allow-touchpad-three-finger-click", |
| 879 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 879 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| 880 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, | 880 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, |
| 881 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, | 881 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| 882 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, | 882 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| 883 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, | 883 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, |
| 884 SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)}, | 884 SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)}, |
| 885 {"ash-enable-window-cycle-ui", IDS_FLAGS_ASH_ENABLE_WINDOW_CYCLE_UI_NAME, |
| 886 IDS_FLAGS_ASH_ENABLE_WINDOW_CYCLE_UI_DESCRIPTION, kOsCrOS, |
| 887 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWindowCycleUi)}, |
| 885 {"enable-easy-unlock-proximity-detection", | 888 {"enable-easy-unlock-proximity-detection", |
| 886 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, | 889 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| 887 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, | 890 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, |
| 888 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, | 891 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, |
| 889 {"enable-easy-unlock-bluetooth-low-energy-detection", | 892 {"enable-easy-unlock-bluetooth-low-energy-detection", |
| 890 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, | 893 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, |
| 891 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, | 894 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, |
| 892 SINGLE_VALUE_TYPE( | 895 SINGLE_VALUE_TYPE( |
| 893 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, | 896 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, |
| 894 #endif | 897 #endif |
| (...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2193 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2196 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2194 | 2197 |
| 2195 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2198 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2196 *count = arraysize(kFeatureEntries); | 2199 *count = arraysize(kFeatureEntries); |
| 2197 return kFeatureEntries; | 2200 return kFeatureEntries; |
| 2198 } | 2201 } |
| 2199 | 2202 |
| 2200 } // namespace testing | 2203 } // namespace testing |
| 2201 | 2204 |
| 2202 } // namespace about_flags | 2205 } // namespace about_flags |
| OLD | NEW |