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: 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:

« chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc ('K') | « chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc ('k') | chrome/browser/resources/options_resources.grd » ('j') | chrome/browser/resources/settings/people_page/fingerprint_list.html » ('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 240 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
251 (*s_whitelist)[chromeos::kAttestationForContentProtectionEnabled] =	251 (*s_whitelist)[chromeos::kAttestationForContentProtectionEnabled] =

252 settings_private::PrefType::PREF_TYPE_BOOLEAN;	252 settings_private::PrefType::PREF_TYPE_BOOLEAN;

253	253

254 // Bluetooth & Internet settings.	254 // Bluetooth & Internet settings.

255 (*s_whitelist)[chromeos::kAllowBluetooth] =	255 (*s_whitelist)[chromeos::kAllowBluetooth] =

256 settings_private::PrefType::PREF_TYPE_BOOLEAN;	256 settings_private::PrefType::PREF_TYPE_BOOLEAN;

257 (*s_whitelist)[proxy_config::prefs::kUseSharedProxies] =	257 (*s_whitelist)[proxy_config::prefs::kUseSharedProxies] =

258 settings_private::PrefType::PREF_TYPE_BOOLEAN;	258 settings_private::PrefType::PREF_TYPE_BOOLEAN;

259 (*s_whitelist)[::prefs::kWakeOnWifiDarkConnect] =	259 (*s_whitelist)[::prefs::kWakeOnWifiDarkConnect] =

260 settings_private::PrefType::PREF_TYPE_BOOLEAN;	260 settings_private::PrefType::PREF_TYPE_BOOLEAN;

	261 (*s_whitelist)[::prefs::kEnableAutoScreenLock] =
	jdufault 2016/12/01 17:11:19 This looks like a duplicate entry. This looks like a duplicate entry. sammiequon 2016/12/01 20:52:29 Done. Show quoted text On 2016/12/01 17:11:19, jdufault wrote: > This looks like a duplicate entry. Done.
	262 settings_private::PrefType::PREF_TYPE_BOOLEAN;

	263 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] =
	jdufault 2016/12/01 17:11:19 This should go in people section? This should go in people section? sammiequon 2016/12/01 20:52:29 Oops. Done. Show quoted text On 2016/12/01 17:11:19, jdufault wrote: > This should go in people section? Oops. Done.
	264 settings_private::PrefType::PREF_TYPE_BOOLEAN;

261	265

262 // Timezone settings.	266 // Timezone settings.

263 (*s_whitelist)[chromeos::kSystemTimezone] =	267 (*s_whitelist)[chromeos::kSystemTimezone] =

264 settings_private::PrefType::PREF_TYPE_BOOLEAN;	268 settings_private::PrefType::PREF_TYPE_BOOLEAN;

265 (*s_whitelist)[::prefs::kResolveTimezoneByGeolocation] =	269 (*s_whitelist)[::prefs::kResolveTimezoneByGeolocation] =

266 settings_private::PrefType::PREF_TYPE_BOOLEAN;	270 settings_private::PrefType::PREF_TYPE_BOOLEAN;

267	271

268 // Ash settings.	272 // Ash settings.

269 (*s_whitelist)[::prefs::kEnableStylusTools] =	273 (*s_whitelist)[::prefs::kEnableStylusTools] =

270 settings_private::PrefType::PREF_TYPE_BOOLEAN;	274 settings_private::PrefType::PREF_TYPE_BOOLEAN;

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

722 return GetExtensionOverridingSearchEngine(profile_);	726 return GetExtensionOverridingSearchEngine(profile_);

723	727

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

725 return GetExtensionOverridingProxy(profile_);	729 return GetExtensionOverridingProxy(profile_);

726	730

727 return nullptr;	731 return nullptr;

728 }	732 }

729	733

730 } // namespace extensions	734 } // namespace extensions

OLD	NEW