[consent toggle] Generalise privacy notice resources.

These are some small modifications to allow for a new privacy notice to
be added cleanly.

Bug: 1079169
Change-Id: I60d4a8c7754f2573055e16990ae524876378eb0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2226101Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Commit-Queue: Rachel Wong <wrong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774925}

ash/app_list/views/assistant/assistant_privacy_info_view.cc

@@ -15,7 +15,8 @@ namespace ash {
 AssistantPrivacyInfoView::AssistantPrivacyInfoView(
     AppListViewDelegate* view_delegate,
     SearchResultPageView* search_result_page_view)
-    : PrivacyInfoView(IDS_APP_LIST_ASSISTANT_PRIVACY_INFO),
+    : PrivacyInfoView(IDS_APP_LIST_ASSISTANT_PRIVACY_INFO,
+                      IDS_APP_LIST_LEARN_MORE),
       view_delegate_(view_delegate),
       search_result_page_view_(search_result_page_view) {}
 
@@ -27,7 +28,7 @@ void AssistantPrivacyInfoView::ButtonPressed(views::Button* sender,
     return;
 
   view_delegate_->MarkAssistantPrivacyInfoDismissed();
-  search_result_page_view_->OnAssistantPrivacyInfoViewCloseButtonPressed();
+  search_result_page_view_->OnPrivacyInfoViewCloseButtonPressed();
 }
 
 void AssistantPrivacyInfoView::StyledLabelLinkClicked(views::StyledLabel* label,

ash/app_list/views/privacy_info_view.cc

@@ -32,8 +32,10 @@ constexpr int kIconSizeDip = 20;
 
 }  // namespace
 
-PrivacyInfoView::PrivacyInfoView(const int info_string_id) {
-  InitLayout(info_string_id);
+PrivacyInfoView::PrivacyInfoView(const int info_string_id,
+                                 const int link_string_id)
+    : info_string_id_(info_string_id), link_string_id_(link_string_id) {
+  InitLayout();
 }
 
 PrivacyInfoView::~PrivacyInfoView() = default;
@@ -84,7 +86,7 @@ void PrivacyInfoView::OnGestureEvent(ui::GestureEvent* event) {
   }
 }
 
-void PrivacyInfoView::InitLayout(const int info_string_id) {
+void PrivacyInfoView::InitLayout() {
   SetLayoutManager(std::make_unique<views::FillLayout>());
   SetBorder(views::CreateEmptyBorder(gfx::Insets(kRowMarginDip)));
   row_container_ = AddChildView(std::make_unique<views::View>());
@@ -108,7 +110,7 @@ void PrivacyInfoView::InitLayout(const int info_string_id) {
   InitInfoIcon();
 
   // Text.
-  InitText(info_string_id);
+  InitText();
 
   // Spacer.
   layout_manager->SetFlexForView(
@@ -126,12 +128,11 @@ void PrivacyInfoView::InitInfoIcon() {
                                              gfx::kGoogleBlue600));
 }
 
-void PrivacyInfoView::InitText(const int info_string_id) {
-  const base::string16 link =
-      l10n_util::GetStringUTF16(IDS_APP_LIST_LEARN_MORE);
+void PrivacyInfoView::InitText() {
+  const base::string16 link = l10n_util::GetStringUTF16(link_string_id_);
   size_t offset;
   const base::string16 text =
-      l10n_util::GetStringFUTF16(info_string_id, link, &offset);
+      l10n_util::GetStringFUTF16(info_string_id_, link, &offset);
   auto text_view = std::make_unique<views::StyledLabel>(text, this);
   views::StyledLabel::RangeStyleInfo style;
   style.custom_font = text_view->GetDefaultFontList().Derive(
@@ -155,9 +156,7 @@ void PrivacyInfoView::InitCloseButton() {
                                                gfx::kGoogleGrey700));
   close_button->SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
   close_button->SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
-  // TODO(crbug/1079169): Create a new string that is not Assistant-specific.
-  base::string16 close_button_label(
-      l10n_util::GetStringUTF16(IDS_APP_LIST_ASSISTANT_PRIVACY_INFO_CLOSE));
+  base::string16 close_button_label(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
   close_button->SetAccessibleName(close_button_label);
   close_button->SetTooltipText(close_button_label);
   close_button->SetFocusBehavior(FocusBehavior::ALWAYS);

ash/app_list/views/privacy_info_view.h

@@ -34,14 +34,14 @@ class PrivacyInfoView : public views::View,
   void OnGestureEvent(ui::GestureEvent* event) override;
 
  protected:
-  explicit PrivacyInfoView(int info_string_id);
+  PrivacyInfoView(int info_string_id, int link_string_id);
 
   bool IsCloseButton(views::Button* button) const;
 
  private:
-  void InitLayout(int info_string_id);
+  void InitLayout();
   void InitInfoIcon();
-  void InitText(int info_string_id);
+  void InitText();
   void InitCloseButton();
 
   views::View* row_container_ = nullptr;        // Owned by view hierarchy.
@@ -49,6 +49,9 @@ class PrivacyInfoView : public views::View,
   views::StyledLabel* text_view_ = nullptr;     // Owned by view hierarchy.
   views::ImageButton* close_button_ = nullptr;  // Owned by view hierarchy.
 
+  const int info_string_id_;
+  const int link_string_id_;
+
   DISALLOW_COPY_AND_ASSIGN(PrivacyInfoView);
 };
 

ash/app_list/views/search_result_page_view.cc

@@ -440,7 +440,7 @@ void SearchResultPageView::SearchEngineChanged() {}
 
 void SearchResultPageView::ShowAssistantChanged() {}
 
-void SearchResultPageView::OnAssistantPrivacyInfoViewCloseButtonPressed() {
+void SearchResultPageView::OnPrivacyInfoViewCloseButtonPressed() {
   ReorderSearchResultContainers();
 }
 

ash/app_list/views/search_result_page_view.h

@@ -93,7 +93,7 @@ class APP_LIST_EXPORT SearchResultPageView
   void SearchEngineChanged() override;
   void ShowAssistantChanged() override;
 
-  void OnAssistantPrivacyInfoViewCloseButtonPressed();
+  void OnPrivacyInfoViewCloseButtonPressed();
 
   // Shows a dialog widget, and anchors it within the search results page. The
   // dialog will be positioned relative to the search box bounds, and will be