| 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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, | 905 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, |
| 906 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, | 906 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, |
| 907 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, | 907 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, |
| 908 #endif | 908 #endif |
| 909 #if defined(ENABLE_PLUGINS) | 909 #if defined(ENABLE_PLUGINS) |
| 910 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 910 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 911 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, | 911 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, |
| 912 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, | 912 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| 913 #endif | 913 #endif |
| 914 #if defined(OS_CHROMEOS) | 914 #if defined(OS_CHROMEOS) |
| 915 {"mash", |
| 916 IDS_FLAGS_USE_MASH_NAME, |
| 917 IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS, |
| 918 SINGLE_VALUE_TYPE("mash")}, |
| 915 {"allow-touchpad-three-finger-click", | 919 {"allow-touchpad-three-finger-click", |
| 916 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 920 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| 917 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, | 921 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, |
| 918 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, | 922 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| 919 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, | 923 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| 920 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, | 924 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, |
| 921 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, | 925 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, |
| 922 {"enable-easy-unlock-proximity-detection", | 926 {"enable-easy-unlock-proximity-detection", |
| 923 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, | 927 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| 924 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, | 928 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, |
| (...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2307 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2308 | 2312 |
| 2309 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2313 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2310 *count = arraysize(kFeatureEntries); | 2314 *count = arraysize(kFeatureEntries); |
| 2311 return kFeatureEntries; | 2315 return kFeatureEntries; |
| 2312 } | 2316 } |
| 2313 | 2317 |
| 2314 } // namespace testing | 2318 } // namespace testing |
| 2315 | 2319 |
| 2316 } // namespace about_flags | 2320 } // namespace about_flags |
| OLD | NEW |