Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Rebased. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 kOsWin | kOsMac | kOsLinux | kOsAndroid, 2036 kOsWin | kOsMac | kOsLinux | kOsAndroid,
2037 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, 2037 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
2038 {"disable-background-video-track", 2038 {"disable-background-video-track",
2039 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, 2039 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
2040 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, 2040 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
2041 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, 2041 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
2042 #if defined(OS_CHROMEOS) 2042 #if defined(OS_CHROMEOS)
2043 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, 2043 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
2044 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, 2044 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
2045 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, 2045 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
2046 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
2047 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
2048 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
2046 #endif // OS_CHROMEOS 2049 #endif // OS_CHROMEOS
2047 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, 2050 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
2048 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, 2051 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll,
2049 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, 2052 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler,
2050 switches::kDisableBrowserTaskScheduler)}, 2053 switches::kDisableBrowserTaskScheduler)},
2051 #if defined(OS_ANDROID) 2054 #if defined(OS_ANDROID)
2052 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, 2055 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK,
2053 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, 2056 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid,
2054 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)}, 2057 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)},
2055 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, 2058 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2385 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2383 2386
2384 const FeatureEntry* GetFeatureEntries(size_t* count) { 2387 const FeatureEntry* GetFeatureEntries(size_t* count) {
2385 *count = arraysize(kFeatureEntries); 2388 *count = arraysize(kFeatureEntries);
2386 return kFeatureEntries; 2389 return kFeatureEntries;
2387 } 2390 }
2388 2391
2389 } // namespace testing 2392 } // namespace testing
2390 2393
2391 } // namespace about_flags 2394 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698