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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Nit. Created 4 years 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 2005 matching lines...) Expand 10 before | Expand all | Expand 10 after
2016 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, 2016 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
2017 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, 2017 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
2018 #if defined(OS_CHROMEOS) 2018 #if defined(OS_CHROMEOS)
2019 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 2019 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
2020 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 2020 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
2021 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 2021 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
2022 chromeos::switches::kDisableFilesQuickView)}, 2022 chromeos::switches::kDisableFilesQuickView)},
2023 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, 2023 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
2024 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, 2024 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
2025 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, 2025 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
2026 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
2027 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
2028 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
2026 #endif // OS_CHROMEOS 2029 #endif // OS_CHROMEOS
2027 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, 2030 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
2028 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, 2031 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll,
2029 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, 2032 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler,
2030 switches::kDisableBrowserTaskScheduler)}, 2033 switches::kDisableBrowserTaskScheduler)},
2031 #if defined(OS_ANDROID) 2034 #if defined(OS_ANDROID)
2032 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, 2035 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK,
2033 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, 2036 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid,
2034 SINGLE_VALUE_TYPE(switches::kEnableWebApk)}, 2037 SINGLE_VALUE_TYPE(switches::kEnableWebApk)},
2035 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, 2038 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
2346 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2349 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2347 2350
2348 const FeatureEntry* GetFeatureEntries(size_t* count) { 2351 const FeatureEntry* GetFeatureEntries(size_t* count) {
2349 *count = arraysize(kFeatureEntries); 2352 *count = arraysize(kFeatureEntries);
2350 return kFeatureEntries; 2353 return kFeatureEntries;
2351 } 2354 }
2352 2355
2353 } // namespace testing 2356 } // namespace testing
2354 2357
2355 } // namespace about_flags 2358 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698