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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 22 errors. Created 3 years, 10 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 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 kOsWin | kOsMac | kOsLinux | kOsAndroid, 2049 kOsWin | kOsMac | kOsLinux | kOsAndroid,
2050 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, 2050 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
2051 {"disable-background-video-track", 2051 {"disable-background-video-track",
2052 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, 2052 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
2053 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, 2053 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
2054 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, 2054 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
2055 #if defined(OS_CHROMEOS) 2055 #if defined(OS_CHROMEOS)
2056 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, 2056 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
2057 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, 2057 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
2058 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, 2058 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
2059 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
2060 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
2061 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
2059 #endif // OS_CHROMEOS 2062 #endif // OS_CHROMEOS
2060 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, 2063 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
2061 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, 2064 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll,
2062 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, 2065 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler,
2063 switches::kDisableBrowserTaskScheduler)}, 2066 switches::kDisableBrowserTaskScheduler)},
2064 #if defined(OS_ANDROID) 2067 #if defined(OS_ANDROID)
2065 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, 2068 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK,
2066 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, 2069 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid,
2067 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)}, 2070 FEATURE_VALUE_TYPE(chrome::android::kImprovedA2HS)},
2068 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, 2071 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
2411 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2414 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2412 2415
2413 const FeatureEntry* GetFeatureEntries(size_t* count) { 2416 const FeatureEntry* GetFeatureEntries(size_t* count) {
2414 *count = arraysize(kFeatureEntries); 2417 *count = arraysize(kFeatureEntries);
2415 return kFeatureEntries; 2418 return kFeatureEntries;
2416 } 2419 }
2417 2420
2418 } // namespace testing 2421 } // namespace testing
2419 2422
2420 } // namespace about_flags 2423 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698