chrome/browser/extensions/api/settings_private/prefs_util.cc - Issue 2538303002: md-settings: Added settings for fingerprint unlock.

Side by Side Diff: chrome/browser/extensions/api/settings_private/prefs_util.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:

« no previous file with comments | « chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc ('k') | chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.js » ('j') | chrome/browser/ui/webui/options/options_ui.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/extensions/api/settings_private/prefs_util.h"	5 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/extensions/chrome_extension_function.h"	9 #include "chrome/browser/extensions/chrome_extension_function.h"

10 #include "chrome/browser/extensions/settings_api_helpers.h"	10 #include "chrome/browser/extensions/settings_api_helpers.h"

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
199 (*s_whitelist)[chromeos::kAccountsPrefSupervisedUsersEnabled] =	199 (*s_whitelist)[chromeos::kAccountsPrefSupervisedUsersEnabled] =

200 settings_private::PrefType::PREF_TYPE_BOOLEAN;	200 settings_private::PrefType::PREF_TYPE_BOOLEAN;

201 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] =	201 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] =

202 settings_private::PrefType::PREF_TYPE_BOOLEAN;	202 settings_private::PrefType::PREF_TYPE_BOOLEAN;

203 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] =	203 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] =

204 settings_private::PrefType::PREF_TYPE_BOOLEAN;	204 settings_private::PrefType::PREF_TYPE_BOOLEAN;

205 (*s_whitelist)[chromeos::kAccountsPrefUsers] =	205 (*s_whitelist)[chromeos::kAccountsPrefUsers] =

206 settings_private::PrefType::PREF_TYPE_LIST;	206 settings_private::PrefType::PREF_TYPE_LIST;

207 (*s_whitelist)[::prefs::kEnableAutoScreenLock] =	207 (*s_whitelist)[::prefs::kEnableAutoScreenLock] =

208 settings_private::PrefType::PREF_TYPE_BOOLEAN;	208 settings_private::PrefType::PREF_TYPE_BOOLEAN;

	209 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] =

	210 settings_private::PrefType::PREF_TYPE_BOOLEAN;

209	211

210 // Accessibility.	212 // Accessibility.

211 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] =	213 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] =

212 settings_private::PrefType::PREF_TYPE_BOOLEAN;	214 settings_private::PrefType::PREF_TYPE_BOOLEAN;

213 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] =	215 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] =

214 settings_private::PrefType::PREF_TYPE_BOOLEAN;	216 settings_private::PrefType::PREF_TYPE_BOOLEAN;

215 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] =	217 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] =

216 settings_private::PrefType::PREF_TYPE_BOOLEAN;	218 settings_private::PrefType::PREF_TYPE_BOOLEAN;

217 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] =	219 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] =

218 settings_private::PrefType::PREF_TYPE_BOOLEAN;	220 settings_private::PrefType::PREF_TYPE_BOOLEAN;

(...skipping 506 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
725 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)	727 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)

726 return GetExtensionOverridingSearchEngine(profile_);	728 return GetExtensionOverridingSearchEngine(profile_);

727	729

728 if (pref_object.key == proxy_config::prefs::kProxy)	730 if (pref_object.key == proxy_config::prefs::kProxy)

729 return GetExtensionOverridingProxy(profile_);	731 return GetExtensionOverridingProxy(profile_);

730	732

731 return nullptr;	733 return nullptr;

732 }	734 }

733	735

734 } // namespace extensions	736 } // namespace extensions

OLD	NEW