NUX Google Apps - Add option to specify string for bookmark bubble.

Bug: 832938
Change-Id: I315fa5a1fbb25d321828b922271c067f38a54535
Reviewed-on: https://chromium-review.googlesource.com/1157513
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580338}

chrome/app/generated_resources.grd

@@ -5015,14 +5015,6 @@ the Bookmarks menu.">
         Open a new tab to browse two sites at once
       </message>
 
-      <!-- NUX Experiment strings -->
-      <if expr="is_win">
-        <!-- Note: Each experiment should add their own message instead of using this default -->
-        <message name="IDS_BOOKMARK_BAR_PROMO_DEFAULT" desc="Default text shown when promoting a bookmark in the bookmark bar.">
-          A bookmark has been added for you
-        </message>
-      </if>
-
       <!-- Browser Hung Plugin Detector -->
       <if expr="is_win">
         <message name="IDS_BROWSER_HANGMONITOR" desc="A plugin on a page has hung">

chrome/browser/ui/views/feature_promos/bookmark_bar_promo_bubble_view.cc

@@ -11,23 +11,25 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 
-std::unique_ptr<ShowPromoDelegate> ShowPromoDelegate::CreatePromoDelegate() {
-  return std::make_unique<BookmarkBarPromoBubbleView>();
+std::unique_ptr<ShowPromoDelegate> ShowPromoDelegate::CreatePromoDelegate(
+    int string_specifier) {
+  return std::make_unique<BookmarkBarPromoBubbleView>(string_specifier);
 }
 
 struct BookmarkBarPromoBubbleView::BubbleImpl : public FeaturePromoBubbleView {
   // Anchors the BookmarkBarPromoBubbleView to |anchor_view|.
   // The bubble widget and promo are owned by their native widget.
-  explicit BubbleImpl(views::View* anchor_view)
+  explicit BubbleImpl(views::View* anchor_view, int string_specifier)
       : FeaturePromoBubbleView(anchor_view,
                                views::BubbleBorder::TOP_LEFT,
-                               IDS_BOOKMARK_BAR_PROMO_DEFAULT,
+                               string_specifier,
                                ActivationAction::DO_NOT_ACTIVATE) {}
 
   ~BubbleImpl() override = default;
 };
 
-BookmarkBarPromoBubbleView::BookmarkBarPromoBubbleView() = default;
+BookmarkBarPromoBubbleView::BookmarkBarPromoBubbleView(int string_specifier)
+    : string_specifier(string_specifier) {}
 
 void BookmarkBarPromoBubbleView::ShowForNode(
     const bookmarks::BookmarkNode* node) {
@@ -36,5 +38,5 @@ void BookmarkBarPromoBubbleView::ShowForNode(
           BrowserList::GetInstance()->GetLastActive())
           ->bookmark_bar()
           ->GetBookmarkButtonForNode(node);
-  new BookmarkBarPromoBubbleView::BubbleImpl(anchor_view);
+  new BookmarkBarPromoBubbleView::BubbleImpl(anchor_view, string_specifier);
 }

chrome/browser/ui/views/feature_promos/bookmark_bar_promo_bubble_view.h

@@ -21,7 +21,7 @@ class BookmarkNode;
 // relevant bookmark node.
 class BookmarkBarPromoBubbleView : public ShowPromoDelegate {
  public:
-  BookmarkBarPromoBubbleView();
+  explicit BookmarkBarPromoBubbleView(int string_specifier);
   ~BookmarkBarPromoBubbleView() override = default;
 
   // ShowPromoDelegate:
@@ -32,6 +32,9 @@ class BookmarkBarPromoBubbleView : public ShowPromoDelegate {
  private:
   struct BubbleImpl;
 
+  // The string that will be shown on this bubble.
+  int string_specifier;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarPromoBubbleView);
 };
 

chrome/browser/ui/views/feature_promos/bookmark_bar_promo_dialog_browsertest.cc

@@ -9,6 +9,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/strings/grit/components_strings.h"
 
 class BookmarkBarPromoDialogTest : public DialogBrowserTest {
  public:
@@ -25,7 +26,8 @@ class BookmarkBarPromoDialogTest : public DialogBrowserTest {
                                              "a ");
 
     // Now actually show the promo.
-    BookmarkBarPromoBubbleView bubble_view;
+    BookmarkBarPromoBubbleView bubble_view(
+        IDS_NUX_GOOGLE_APPS_DESCRIPTION_PROMO_BUBBLE);
     bubble_view.ShowForNode(model->bookmark_bar_node()->GetChild(0));
   }
 

components/nux/show_promo_delegate.h

@@ -19,7 +19,8 @@ class ShowPromoDelegate {
   virtual void ShowForNode(const bookmarks::BookmarkNode* node) = 0;
 
   // Return an instance of the promo delegate.
-  static std::unique_ptr<ShowPromoDelegate> CreatePromoDelegate();
+  static std::unique_ptr<ShowPromoDelegate> CreatePromoDelegate(
+      int string_specifier);
 };
 
 #endif  //  COMPONENTS_NUX_SHOW_PROMO_DELEGATE_H_

components/nux_google_apps/google_apps_handler.cc

@@ -103,8 +103,9 @@ void GoogleAppsHandler::HandleAddGoogleApps(const base::ListValue* args) {
   // TODO(hcarmona): Any advice here would be helpful.
 
   // Show bookmark bubble.
-  ShowPromoDelegate::CreatePromoDelegate()->ShowForNode(
-      bookmark_model_->bookmark_bar_node()->GetChild(0));
+  ShowPromoDelegate::CreatePromoDelegate(
+      IDS_NUX_GOOGLE_APPS_DESCRIPTION_PROMO_BUBBLE)
+      ->ShowForNode(bookmark_model_->bookmark_bar_node()->GetChild(0));
 
   UMA_HISTOGRAM_ENUMERATION(kGoogleAppsInteractionHistogram,
                             GoogleAppsInteraction::kGetStarted,

components/nux_google_apps_strings.grdp

@@ -6,4 +6,7 @@
   <message name="IDS_NUX_GOOGLE_APPS_DESCRIPTION" desc="Description of what selecting apps and pressing 'Get started' will do.">
     Get quick access to your favorite Google Apps
   </message>
+  <message name="IDS_NUX_GOOGLE_APPS_DESCRIPTION_PROMO_BUBBLE" desc="Text shown when Google Apps have been added to highlight where bookmarks have been placed.">
+    Open apps easily with bookmarks
+  </message>
 </grit-part>