Filter search box text changes by result type rather than id.

Bug: 1112714
Change-Id: I19e39200262e0a8c44683cc9f92bca3b34dc9cb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359879Reviewed-by: Xiyuan Slow <xiyuan@chromium.org>
Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: Rachel Wong <wrong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803738}

ash/app_list/views/privacy_container_view.cc

@@ -33,6 +33,7 @@ PrivacyContainerView::PrivacyContainerView(AppListViewDelegate* view_delegate)
 
   auto metadata = std::make_unique<SearchResultMetadata>();
   metadata->id = "PrivacyInfoResult";
+  metadata->result_type = AppListSearchResultType::kInternalPrivacyInfo;
   result_.SetMetadata(std::move(metadata));
 
   // This container simply wraps around PrivacyInfoView.

ash/app_list/views/search_box_view.cc

@@ -740,8 +740,8 @@ void SearchBoxView::ButtonPressed(views::Button* sender,
 
 void SearchBoxView::UpdateSearchBoxTextForSelectedResult(
     SearchResult* selected_result) {
-  // TODO(wrong): Filter by result type instead of id.
-  if (selected_result->id() == "PrivacyInfoResult") {
+  if (selected_result->result_type() ==
+      AppListSearchResultType::kInternalPrivacyInfo) {
     // Privacy view should not change the search box text.
     return;
   }

ash/public/cpp/app_list/app_list_types.h

@@ -150,6 +150,7 @@ enum class AppListSearchResultType {
   kDriveQuickAccessChip,   // Drive file results in suggestion chips.
   kAssistantChip,          // Assistant results in suggestion chips.
   kOsSettings,             // OS settings results.
+  kInternalPrivacyInfo,    // Result used internally by privacy notices.
   // Add new values here.
 };
 

chrome/browser/ui/app_list/search/search_result_ranker/ranking_item_util.cc

@@ -32,6 +32,7 @@ RankingItemType RankingItemTypeFromSearchResult(
     case ash::AppListSearchResultType::kPlayStoreReinstallApp:
     case ash::AppListSearchResultType::kAssistantChip:
     case ash::AppListSearchResultType::kOsSettings:
+    case ash::AppListSearchResultType::kInternalPrivacyInfo:
       // NOTE: We don't rank results of type kAssistantChip as the Assistant
       // chip result, if present, is always shown in a dedicated slot.
       return RankingItemType::kIgnored;