[omnibox] Suggestion Transparency: Update Remove dialog with UX strings

UX provided some final strings for the Remove dialog, and this CL adds
those strings.

This CL also updates the RemoveSuggestionBubbleDialogDelegateView by
giving the buttons translated text, providing a translated title,
and reordering some labels.

It also plumbs in TemplateURLService to fetch the shortname of the
default search provider.

Bug: 929477
Change-Id: I56d38c006faa51f921b5a054ae5443b3d1656acd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610503
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659710}

chrome/app/generated_resources.grd

@@ -4918,9 +4918,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_OMNIBOX_WHY_THIS_SUGGESTION" desc="The title of a menu entry and bubble that explains why this suggestion appears in the omnibox popup.">
         Why this suggestion?
       </message>
-      <message name="IDS_OMNIBOX_REMOVE_SUGGESTION" desc="The title of a menu entry and bubble used to delete omnibox suggestions.">
+      <message name="IDS_OMNIBOX_REMOVE_SUGGESTION" desc="The text of a context menu entry to delete an omnibox suggestion.">
         Remove suggestion
       </message>
+      <message name="IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_TITLE" desc="The title of a bubble to delete an omnibox suggestion.">
+        Remove suggestion?
+      </message>
+      <message name="IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_DESCRIPTION" desc="The description of a bubble to delete an omnibox suggestion.">
+        This page will also be removed from your history and <ph name="SEARCH_ENGINE">$1<ex>Google</ex></ph> activity.
+      </message>
 
       <!-- NTP -->
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, and Google is the default search engine.">

chrome/app/generated_resources_grd/IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_DESCRIPTION.png.sha1

+4f7bd70a3a0304338ef3af278686c8cd75162ee9
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_TITLE.png.sha1

+4f7bd70a3a0304338ef3af278686c8cd75162ee9
\ No newline at end of file

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -476,7 +476,11 @@ void OmniboxResultView::ExecuteCommand(int command_id, int event_flags) {
       popup_contents_view_->model()->result().match_at(model_index_);
 
   if (command_id == IDS_OMNIBOX_REMOVE_SUGGESTION) {
-    ShowRemoveSuggestion(this, raw_match,
+    TemplateURLService* template_url_service = popup_contents_view_->model()
+                                                   ->edit_model()
+                                                   ->client()
+                                                   ->GetTemplateURLService();
+    ShowRemoveSuggestion(template_url_service, this, raw_match,
                          base::BindOnce(&OmniboxResultView::RemoveSuggestion,
                                         weak_factory_.GetWeakPtr()));
   } else if (command_id == IDS_OMNIBOX_WHY_THIS_SUGGESTION) {

chrome/browser/ui/views/omnibox/remove_suggestion_bubble.cc

@@ -10,6 +10,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/autocomplete_match.h"
+#include "components/search_engines/template_url_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
@@ -21,49 +22,64 @@ namespace {
 class RemoveSuggestionBubbleDialogDelegateView
     : public views::BubbleDialogDelegateView {
  public:
-  RemoveSuggestionBubbleDialogDelegateView(views::View* anchor_view,
-                                           const AutocompleteMatch& match,
-                                           base::OnceClosure remove_closure)
+  RemoveSuggestionBubbleDialogDelegateView(
+      TemplateURLService* template_url_service,
+      views::View* anchor_view,
+      const AutocompleteMatch& match,
+      base::OnceClosure remove_closure)
       : views::BubbleDialogDelegateView(anchor_view,
                                         views::BubbleBorder::TOP_LEFT),
         match_(match),
         remove_closure_(std::move(remove_closure)) {
+    DCHECK(template_url_service);
+    DCHECK(match_.SupportsDeletion());
+
     auto* layout_manager = SetLayoutManager(
         std::make_unique<views::BoxLayout>(views::BoxLayout::kVertical));
     layout_manager->set_cross_axis_alignment(
         views::BoxLayout::CrossAxisAlignment::kStart);
     // TODO(tommycli): Replace this with the real spacing from UX.
     layout_manager->set_between_child_spacing(16);
-    // TODO(tommycli): Replace this with the real translated string from UX.
-    views::Label* why_this_suggestion_label =
-        new views::Label(match.GetWhyThisSuggestionText());
-    why_this_suggestion_label->SetMultiLine(true);
-    why_this_suggestion_label->SetHorizontalAlignment(
+
+    // Get the Search Provider name associated with this match.
+    base::string16 search_provider_short_name;
+    const TemplateURL* template_url =
+        match.GetTemplateURL(template_url_service, false);
+    // If the match has no associated Search Provider, get the default one,
+    // although this may still fail if it's forbidden by policy.
+    if (!template_url) {
+      template_url = template_url_service->GetDefaultSearchProvider();
+    }
+    if (template_url) {
+      search_provider_short_name =
+          template_url->AdjustedShortNameForLocaleDirection();
+    }
+
+    views::Label* description_label =
+        new views::Label(l10n_util::GetStringFUTF16(
+            IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_DESCRIPTION,
+            search_provider_short_name));
+    description_label->SetMultiLine(true);
+    description_label->SetHorizontalAlignment(
         gfx::HorizontalAlignment::ALIGN_LEFT);
-    AddChildView(why_this_suggestion_label);
+    AddChildView(description_label);
 
-    AddChildView(new views::Label(base::ASCIIToUTF16(
-        match.SupportsDeletion() ? "Remove suggestion from history?"
-                                 : "This match cannot be removed.")));
+    // TODO(tommycli): Indent and set a smaller font per UX suggestions.
+    views::Label* url_label = new views::Label(match.contents);
+    url_label->SetMultiLine(true);
+    url_label->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
+    AddChildView(url_label);
   }
 
   // views::DialogDelegateView:
   int GetDialogButtons() const override {
-    int buttons = ui::DIALOG_BUTTON_CANCEL;
-    if (match_.SupportsDeletion())
-      buttons |= ui::DIALOG_BUTTON_OK;
-    return buttons;
+    return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
   }
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override {
-    // TODO(tommycli): Replace this with the real translated string from UX.
-    if (button == ui::DIALOG_BUTTON_OK)
-      return base::ASCIIToUTF16("Remove");
-
-    return l10n_util::GetStringUTF16(match_.SupportsDeletion() ? IDS_CANCEL
-                                                               : IDS_CLOSE);
+    return l10n_util::GetStringUTF16(
+        button == ui::DIALOG_BUTTON_OK ? IDS_REMOVE : IDS_CANCEL);
   }
   bool Accept() override {
-    DCHECK(match_.SupportsDeletion());
     std::move(remove_closure_).Run();
     return true;
   }
@@ -76,7 +92,10 @@ class RemoveSuggestionBubbleDialogDelegateView
 
   // views::WidgetDelegate:
   ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_WINDOW; }
-  base::string16 GetWindowTitle() const override { return match_.contents; }
+  base::string16 GetWindowTitle() const override {
+    return l10n_util::GetStringUTF16(
+        IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_TITLE);
+  }
 
  private:
   AutocompleteMatch match_;
@@ -85,12 +104,13 @@ class RemoveSuggestionBubbleDialogDelegateView
 
 }  // namespace
 
-void ShowRemoveSuggestion(views::View* anchor_view,
+void ShowRemoveSuggestion(TemplateURLService* template_url_service,
+                          views::View* anchor_view,
                           const AutocompleteMatch& match,
                           base::OnceClosure remove_closure) {
   views::BubbleDialogDelegateView::CreateBubble(
-      new RemoveSuggestionBubbleDialogDelegateView(anchor_view, match,
-                                                   std::move(remove_closure)))
+      new RemoveSuggestionBubbleDialogDelegateView(
+          template_url_service, anchor_view, match, std::move(remove_closure)))
       ->Show();
 }
 

chrome/browser/ui/views/omnibox/remove_suggestion_bubble.h

@@ -7,6 +7,7 @@
 
 #include "base/callback_forward.h"
 
+class TemplateURLService;
 struct AutocompleteMatch;
 
 namespace views {
@@ -16,7 +17,8 @@ class View;
 // Shows a confirmation bubble to remove a suggestion represented by |match|.
 // If the user clicks Remove, then |remove_closure| is executed, and the bubble
 // is closed.
-void ShowRemoveSuggestion(views::View* anchor_view,
+void ShowRemoveSuggestion(TemplateURLService* template_url_service,
+                          views::View* anchor_view,
                           const AutocompleteMatch& match,
                           base::OnceClosure remove_closure);
 

components/components_strings.grd

@@ -250,6 +250,9 @@
       <message name="IDS_ADD" desc="Used for Add on buttons">
         Add
       </message>
+      <message name="IDS_REMOVE" desc="Used for Remove on buttons">
+        Remove
+      </message>
       <message name="IDS_SAVE" desc="Used on a button to save information you are editing.">
         Save
       </message>

components/components_strings_grd/IDS_REMOVE.png.sha1

+4f7bd70a3a0304338ef3af278686c8cd75162ee9
\ No newline at end of file

components/omnibox/browser/omnibox_popup_model.h

@@ -64,6 +64,7 @@ class OmniboxPopupModel {
   bool IsOpen() const;
 
   OmniboxPopupView* view() const { return view_; }
+  OmniboxEditModel* edit_model() const { return edit_model_; }
 
   // Returns the AutocompleteController used by this popup.
   AutocompleteController* autocomplete_controller() const {