Set the privacy container score based on app list config.

The privacy container score was previously set to INT_MAX to ensure that
it was the first container, because other container scores could
fluctuate. The app list config now consolidates the scores for all
search result containers, see
https://chromium-review.googlesource.com/c/chromium/src/+/2345924.

Bug: 1079169
Change-Id: I1caf9a3bd94f2c71aed68fe79f2ec88fa4f39645
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377185Reviewed-by: Tony Yeoman <tby@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Rachel Wong <wrong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802083}

ash/app_list/views/privacy_container_view.cc

@@ -11,6 +11,7 @@
 #include "ash/app_list/model/search/search_result.h"
 #include "ash/app_list/views/assistant/assistant_privacy_info_view.h"
 #include "ash/app_list/views/suggested_content_info_view.h"
+#include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
 #include "ui/views/layout/box_layout.h"
 
@@ -87,7 +88,9 @@ int PrivacyContainerView::DoUpdate() {
   // the top of the results list.
   const bool should_show_container =
       should_show_assistant || should_show_suggested_content;
-  set_container_score(should_show_container ? INT_MAX : -1);
+  set_container_score(should_show_container
+                          ? AppListConfig::instance().privacy_container_score()
+                          : -1);
   return should_show_container ? 1 : 0;
 }
 

ash/public/cpp/app_list/app_list_config.h

@@ -176,6 +176,7 @@ class ASH_PUBLIC_EXPORT AppListConfig {
     return max_search_result_list_items_;
   }
 
+  double privacy_container_score() const { return privacy_container_score_; }
   double app_tiles_container_score() const {
     return app_tiles_container_score_;
   }
@@ -472,8 +473,11 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   // Max number of search result list items in the launcher suggestion window.
   const size_t max_search_result_list_items_ = 5;
 
-  // Scores for the three containers within the search box view. These are
-  // displayed in high-to-low order.
+  // Scores for the containers within the search box view. These are displayed
+  // in high-to-low order.
+  // The privacy container is not always visible, but when available it should
+  // always be the first item underneath the search box.
+  const double privacy_container_score_ = 4.0;
   const double app_tiles_container_score_ = 3.0;
   const double answer_card_container_score_ = 2.0;
   const double results_list_container_score_ = 1.0;