diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-18 14:18:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-18 14:38:27 +0000 |
| commit | 0078283f3cf586ae8a0d0df501a08e7440636b43 (patch) | |
| tree | 9e227bbc71af5611b00176d23bf4f474c09bf54c /chromium/chrome/browser/ui/webui/settings | |
| parent | eaf1da4d961fbbda9455f9af3b23d1af777f43fa (diff) | |
BASELINE: Update Chromium to 73.0.3683.83
Change-Id: Ie2948cebb1e9204f293fdf63c36d6215a5f5b507
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/settings')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/settings/md_settings_ui.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chromium/chrome/browser/ui/webui/settings/md_settings_ui.cc index 5a9b7b784ef..34587daaef9 100644 --- a/chromium/chrome/browser/ui/webui/settings/md_settings_ui.cc +++ b/chromium/chrome/browser/ui/webui/settings/md_settings_ui.cc @@ -113,6 +113,7 @@ #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/arc/arc_util.h" #include "ui/base/ui_base_features.h" +#include "ui/chromeos/resources/grit/ui_chromeos_resources.h" #else // !defined(OS_CHROMEOS) #include "chrome/browser/signin/account_consistency_mode_manager.h" #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" @@ -313,9 +314,15 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) html_source->AddBoolean( "quickUnlockDisabledByPolicy", chromeos::quick_unlock::IsPinDisabledByPolicy(profile->GetPrefs())); - html_source->AddBoolean( - "fingerprintUnlockEnabled", - chromeos::quick_unlock::IsFingerprintEnabled(profile)); + const bool fingerprint_unlock_enabled = + chromeos::quick_unlock::IsFingerprintEnabled(profile); + html_source->AddBoolean("fingerprintUnlockEnabled", + fingerprint_unlock_enabled); + if (fingerprint_unlock_enabled) { + html_source->AddBoolean( + "isFingerprintReaderOnKeyboard", + chromeos::quick_unlock::IsFingerprintReaderOnKeyboard()); + } html_source->AddBoolean("lockScreenNotificationsEnabled", ash::features::IsLockScreenNotificationsEnabled()); html_source->AddBoolean( |