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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 10 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 1988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, 1999 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
2000 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, 2000 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
2001 #if defined(OS_CHROMEOS) 2001 #if defined(OS_CHROMEOS)
2002 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 2002 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
2003 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 2003 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
2004 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 2004 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
2005 chromeos::switches::kDisableFilesQuickView)}, 2005 chromeos::switches::kDisableFilesQuickView)},
2006 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, 2006 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
2007 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, 2007 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
2008 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, 2008 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
2009 {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
2010 IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
2011 FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
2009 #endif // OS_CHROMEOS 2012 #endif // OS_CHROMEOS
2010 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME, 2013 {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
2011 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll, 2014 IDS_FLAGS_BROWSER_TASK_SCHEDULER_DESCRIPTION, kOsAll,
2012 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler, 2015 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrowserTaskScheduler,
2013 switches::kDisableBrowserTaskScheduler)}, 2016 switches::kDisableBrowserTaskScheduler)},
2014 #if defined(OS_ANDROID) 2017 #if defined(OS_ANDROID)
2015 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK, 2018 {"enable-improved-a2hs", IDS_FLAGS_ENABLE_WEBAPK,
2016 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid, 2019 IDS_FLAGS_ENABLE_WEBAPK_DESCRIPTION, kOsAndroid,
2017 SINGLE_VALUE_TYPE(switches::kEnableWebApk)}, 2020 SINGLE_VALUE_TYPE(switches::kEnableWebApk)},
2018 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT, 2021 {"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
2324 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2327 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2325 2328
2326 const FeatureEntry* GetFeatureEntries(size_t* count) { 2329 const FeatureEntry* GetFeatureEntries(size_t* count) {
2327 *count = arraysize(kFeatureEntries); 2330 *count = arraysize(kFeatureEntries);
2328 return kFeatureEntries; 2331 return kFeatureEntries;
2329 } 2332 }
2330 2333
2331 } // namespace testing 2334 } // namespace testing
2332 2335
2333 } // namespace about_flags 2336 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698