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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 6 errors. 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 1982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1993 kOsAll, 1993 kOsAll,
1994 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, 1994 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
1995 #if defined(OS_CHROMEOS) 1995 #if defined(OS_CHROMEOS)
1996 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 1996 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
1997 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 1997 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
1998 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 1998 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
1999 chromeos::switches::kDisableFilesQuickView)}, 1999 chromeos::switches::kDisableFilesQuickView)},
2000 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, 2000 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
2001 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, 2001 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
2002 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, 2002 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
2003 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
2004 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
2005 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
2003 #endif // OS_CHROMEOS 2006 #endif // OS_CHROMEOS
2004 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, 2007 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
2005 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, 2008 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll,
2006 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, 2009 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler,
2007 switches::kDisableBrowserTaskScheduler)}, 2010 switches::kDisableBrowserTaskScheduler)},
2008 #if defined(OS_ANDROID) 2011 #if defined(OS_ANDROID)
2009 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, 2012 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK,
2010 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, 2013 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid,
2011 SINGLE_VALUE_TYPE(switches::kEnableWebApk)}, 2014 SINGLE_VALUE_TYPE(switches::kEnableWebApk)},
2012 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, 2015 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2314 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2312 2315
2313 const FeatureEntry* GetFeatureEntries(size_t* count) { 2316 const FeatureEntry* GetFeatureEntries(size_t* count) {
2314 *count = arraysize(kFeatureEntries); 2317 *count = arraysize(kFeatureEntries);
2315 return kFeatureEntries; 2318 return kFeatureEntries;
2316 } 2319 }
2317 2320
2318 } // namespace testing 2321 } // namespace testing
2319 2322
2320 } // namespace about_flags 2323 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698