[omnibox] Suggestion Transparency: Separate Info and Remove dialogs

Separate the "More Info / Remove..." context menu entry for
Suggestion Transparency into two context menu entries:

 - Why this suggestion
 - Remove suggestion

This was vetted by our UX folks, and so we are also committing these
strings to our translated strings.

The implementation of the "Why this suggestion" info bubble will be in
a separate CL.

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

chrome/app/generated_resources.grd

@@ -4915,6 +4915,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Search or type web address
         </message>
       </if>
+      <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.">
+        Remove suggestion
+      </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.png.sha1

+fbf9ef5e0af0fb251a41993ae4e833710716439f
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_OMNIBOX_WHY_THIS_SUGGESTION.png.sha1

+fbf9ef5e0af0fb251a41993ae4e833710716439f
\ No newline at end of file

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

@@ -65,9 +65,10 @@ OmniboxResultView::OmniboxResultView(
 
   if (base::FeatureList::IsEnabled(
           omnibox::kOmniboxSuggestionTransparencyOptions)) {
-    // TODO(tommycli): Replace this with the real translated string from UX.
-    context_menu_contents_.AddItem(COMMAND_REMOVE_SUGGESTION,
-                                   base::ASCIIToUTF16("Remove suggestion..."));
+    context_menu_contents_.AddItemWithStringId(IDS_OMNIBOX_WHY_THIS_SUGGESTION,
+                                               IDS_OMNIBOX_WHY_THIS_SUGGESTION);
+    context_menu_contents_.AddItemWithStringId(IDS_OMNIBOX_REMOVE_SUGGESTION,
+                                               IDS_OMNIBOX_REMOVE_SUGGESTION);
     set_context_menu_controller(this);
   }
 }
@@ -446,21 +447,15 @@ void OmniboxResultView::ShowContextMenuForViewImpl(
 }
 
 // ui::SimpleMenuModel::Delegate overrides:
-bool OmniboxResultView::IsItemForCommandIdDynamic(int command_id) const {
-  DCHECK_EQ(COMMAND_REMOVE_SUGGESTION, command_id);
-  return true;
-}
+bool OmniboxResultView::IsCommandIdVisible(int command_id) const {
+  if (command_id == IDS_OMNIBOX_REMOVE_SUGGESTION)
+    return match_.SupportsDeletion();
 
-base::string16 OmniboxResultView::GetLabelForCommandId(int command_id) const {
-  DCHECK_EQ(COMMAND_REMOVE_SUGGESTION, command_id);
-  // TODO(tommycli): Replace this with the real translated string from UX.
-  return base::ASCIIToUTF16(match_.SupportsDeletion() ? "More info / Remove..."
-                                                      : "More info...");
+  DCHECK(command_id == IDS_OMNIBOX_WHY_THIS_SUGGESTION);
+  return true;
 }
 
 void OmniboxResultView::ExecuteCommand(int command_id, int event_flags) {
-  DCHECK_EQ(COMMAND_REMOVE_SUGGESTION, command_id);
-
   // Temporarily inhibit the popup closing on blur while we open the remove
   // suggestion confirmation bubble.
   popup_contents_view_->model()->set_popup_closes_on_blur(false);
@@ -470,9 +465,14 @@ void OmniboxResultView::ExecuteCommand(int command_id, int event_flags) {
   // class, and we don't want that for the bubble. We should improve this.
   AutocompleteMatch raw_match =
       popup_contents_view_->model()->result().match_at(model_index_);
-  ShowRemoveSuggestion(this, raw_match,
-                       base::BindOnce(&OmniboxResultView::RemoveSuggestion,
-                                      weak_factory_.GetWeakPtr()));
+
+  if (command_id == IDS_OMNIBOX_REMOVE_SUGGESTION) {
+    ShowRemoveSuggestion(this, raw_match,
+                         base::BindOnce(&OmniboxResultView::RemoveSuggestion,
+                                        weak_factory_.GetWeakPtr()));
+  } else if (command_id == IDS_OMNIBOX_WHY_THIS_SUGGESTION) {
+    ShowWhyThisSuggestion(this, raw_match);
+  }
 
   popup_contents_view_->model()->set_popup_closes_on_blur(true);
 }

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

@@ -105,14 +105,10 @@ class OmniboxResultView : public views::View,
                                   ui::MenuSourceType source_type) override;
 
   // ui::SimpleMenuModel::Delegate overrides:
-  bool IsItemForCommandIdDynamic(int command_id) const override;
-  base::string16 GetLabelForCommandId(int command_id) const override;
+  bool IsCommandIdVisible(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
-  // TODO(tommycli): This will be removed once we get final strings from UX.
-  enum CommandID { COMMAND_REMOVE_SUGGESTION };
-
   // Returns the height of the text portion of the result view.
   int GetTextHeight() const;
 

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

@@ -93,3 +93,8 @@ void ShowRemoveSuggestion(views::View* anchor_view,
                                                    std::move(remove_closure)))
       ->Show();
 }
+
+void ShowWhyThisSuggestion(views::View* anchor_view,
+                           const AutocompleteMatch& match) {
+  // TODO(tommycli): Implement this.
+}

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

@@ -20,4 +20,8 @@ void ShowRemoveSuggestion(views::View* anchor_view,
                           const AutocompleteMatch& match,
                           base::OnceClosure remove_closure);
 
+// Shows a simple "Why this suggestion" info bubble for |match|.
+void ShowWhyThisSuggestion(views::View* anchor_view,
+                           const AutocompleteMatch& match);
+
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_H_