[OsPeoplePage] Fix "Remove fingerprint" search tag when no prints

Fix the behavior of the "Remove fingerprint" search tag so that it
dynamically changes based on the number of registered fingerprints.

Bug: 1116553
Change-Id: Ifd109dbf6757bede7b079eb7a31d7db3b45b27b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424507
Commit-Queue: Daniel Classon <dclasson@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809557}

chrome/browser/ui/webui/settings/chromeos/people_section.cc

@@ -264,12 +264,6 @@ const std::vector<SearchConcept>& GetKerberosSearchConcepts() {
 
 const std::vector<SearchConcept>& GetFingerprintSearchConcepts() {
   static const base::NoDestructor<std::vector<SearchConcept>> tags({
-      {IDS_OS_SETTINGS_TAG_FINGERPRINT_REMOVE,
-       mojom::kFingerprintSubpagePath,
-       mojom::SearchResultIcon::kFingerprint,
-       mojom::SearchResultDefaultRank::kMedium,
-       mojom::SearchResultType::kSetting,
-       {.setting = mojom::Setting::kRemoveFingerprint}},
       {IDS_OS_SETTINGS_TAG_FINGERPRINT_ADD,
        mojom::kFingerprintSubpagePath,
        mojom::SearchResultIcon::kFingerprint,
@@ -286,6 +280,18 @@ const std::vector<SearchConcept>& GetFingerprintSearchConcepts() {
   return *tags;
 }
 
+const std::vector<SearchConcept>& GetRemoveFingerprintSearchConcepts() {
+  static const base::NoDestructor<std::vector<SearchConcept>> tags({
+      {IDS_OS_SETTINGS_TAG_FINGERPRINT_REMOVE,
+       mojom::kFingerprintSubpagePath,
+       mojom::SearchResultIcon::kFingerprint,
+       mojom::SearchResultDefaultRank::kMedium,
+       mojom::SearchResultType::kSetting,
+       {.setting = mojom::Setting::kRemoveFingerprint}},
+  });
+  return *tags;
+}
+
 const std::vector<SearchConcept>& GetParentalSearchConcepts() {
   static const base::NoDestructor<std::vector<SearchConcept>> tags({
       {IDS_OS_SETTINGS_TAG_PARENTAL_CONTROLS,
@@ -753,10 +759,18 @@ PeopleSection::PeopleSection(
   if (features::ShouldShowParentalControlSettings(profile))
     updater.AddSearchTags(GetParentalSearchConcepts());
 
-  // Fingerprint search tags are added if necessary and do not update
-  // dynamically during a user session.
-  if (AreFingerprintSettingsAllowed())
+  // Fingerprint search tags are added if necessary. Remove fingerprint search
+  // tags update dynamically during a user session.
+  if (AreFingerprintSettingsAllowed()) {
     updater.AddSearchTags(GetFingerprintSearchConcepts());
+
+    fingerprint_pref_change_registrar_.Init(pref_service_);
+    fingerprint_pref_change_registrar_.Add(
+        ::prefs::kQuickUnlockFingerprintRecord,
+        base::BindRepeating(&PeopleSection::UpdateRemoveFingerprintSearchTags,
+                            base::Unretained(this)));
+    UpdateRemoveFingerprintSearchTags();
+  }
 }
 
 PeopleSection::~PeopleSection() {
@@ -1118,5 +1132,18 @@ bool PeopleSection::AreFingerprintSettingsAllowed() {
   return chromeos::quick_unlock::IsFingerprintEnabled(profile());
 }
 
+void PeopleSection::UpdateRemoveFingerprintSearchTags() {
+  SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
+  updater.RemoveSearchTags(GetRemoveFingerprintSearchConcepts());
+
+  // "Remove fingerprint" search tag should exist only when 1 or more
+  // fingerprints are registered.
+  int registered_fingerprint_count =
+      pref_service_->GetInteger(::prefs::kQuickUnlockFingerprintRecord);
+  if (registered_fingerprint_count > 0) {
+    updater.AddSearchTags(GetRemoveFingerprintSearchConcepts());
+  }
+}
+
 }  // namespace settings
 }  // namespace chromeos

chrome/browser/ui/webui/settings/chromeos/people_section.h

@@ -9,6 +9,7 @@
 #include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h"
 #include "chrome/browser/ui/webui/settings/chromeos/os_settings_section.h"
 #include "chromeos/components/account_manager/account_manager.h"
+#include "components/prefs/pref_change_registrar.h"
 #include "components/sync/driver/sync_service_observer.h"
 
 class PrefService;
@@ -79,6 +80,7 @@ class PeopleSection : public OsSettingsSection,
   void FetchAccounts();
   void UpdateAccountManagerSearchTags(
       const std::vector<AccountManager::Account>& accounts);
+  void UpdateRemoveFingerprintSearchTags();
 
   AccountManager* account_manager_ = nullptr;
   syncer::SyncService* sync_service_;
@@ -86,6 +88,7 @@ class PeopleSection : public OsSettingsSection,
   KerberosCredentialsManager* kerberos_credentials_manager_;
   signin::IdentityManager* identity_manager_;
   PrefService* pref_service_;
+  PrefChangeRegistrar fingerprint_pref_change_registrar_;
   base::WeakPtrFactory<PeopleSection> weak_factory_{this};
 };