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 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2054 kOsWin | kOsMac | kOsLinux | kOsAndroid, | 2054 kOsWin | kOsMac | kOsLinux | kOsAndroid, |
2055 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, | 2055 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, |
2056 {"disable-background-video-track", | 2056 {"disable-background-video-track", |
2057 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, | 2057 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, |
2058 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, | 2058 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, |
2059 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, | 2059 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, |
2060 #if defined(OS_CHROMEOS) | 2060 #if defined(OS_CHROMEOS) |
2061 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, | 2061 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, |
2062 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, | 2062 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, |
2063 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, | 2063 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, |
| 2064 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT, |
| 2065 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS, |
| 2066 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)}, |
2064 #endif // OS_CHROMEOS | 2067 #endif // OS_CHROMEOS |
2065 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, | 2068 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, |
2066 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, | 2069 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, |
2067 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, | 2070 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, |
2068 switches::kDisableBrowserTaskScheduler)}, | 2071 switches::kDisableBrowserTaskScheduler)}, |
2069 #if defined(OS_ANDROID) | 2072 #if defined(OS_ANDROID) |
2070 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, | 2073 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, |
2071 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, | 2074 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, |
2072 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)}, | 2075 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)}, |
2073 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, | 2076 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2430 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2433 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2431 | 2434 |
2432 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2435 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2433 *count = arraysize(kFeatureEntries); | 2436 *count = arraysize(kFeatureEntries); |
2434 return kFeatureEntries; | 2437 return kFeatureEntries; |
2435 } | 2438 } |
2436 | 2439 |
2437 } // namespace testing | 2440 } // namespace testing |
2438 | 2441 |
2439 } // namespace about_flags | 2442 } // namespace about_flags |
OLD | NEW |