Integrate Desktop iOS promotion with bookmarks.

chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h"
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 27 matching lines @@
     "SavePasswordsNewBubble", "BookmarksNewBubble", "BookmarksFootNote",
     "HistoryPage",
 };
 
 // Entry point string names, used to check which entry point is targeted from
 // finch parameters.
 const char* kPromotionEntryPointNames[] = {
     "", "SavePasswordsBubblePromotion", "BookmarksBubblePromotion",
     "BookmarksFootnotePromotion", "HistoryPagePromotion"};
 
-// Text used on the promotion body, the first dimension is the text version
-// specified by body_text_id Finch parameter, and the second dimension is for
-// specifying if the phone number is available or not.
-// TODO(crbug.com/676655): Add another dimension for entry points when needed.
-const int kBodyTextId[2][2] = {
-    {IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT,
-     IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_WITH_PHONE_NUMBER},
-    {IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_V2,
-     IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_WITH_PHONE_NUMBER_V2}};
+// Text used on the promotion bubble body when the phone number is present,
+// this array is indexed by the text version specified by body_text_id Finch
+// parameter.
+const int kBubbleBodyTextNoPhoneNumberId[2] = {
+    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT,
+    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_V2};
 
-// Text used on the promotion title, This array is indexed by the text version
-// specified by title_text_id Finch parameter.
-// TODO(crbug.com/676655): Add another dimension for entry points when needed.
-const int kTitleTextId[3] = {
-    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE,
-    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V2,
-    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V3};
+// Text used on the promotion bubble body when the phone number is not present,
+// this array is indexed by the text version specified by body_text_id Finch
+// parameter.
+const int kBubbleBodyTextWithPhoneNumberId[2] = {
+    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_WITH_PHONE_NUMBER,
+    IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TEXT_WITH_PHONE_NUMBER_V2};
+
+// Text used on the promotion bubble title, The first dimension is the entry
+// point, and the second is the text version specified by title_text_id Finch
+// parameter.
+const int kBubbleTitleTextId[2][3] = {
+    {IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE,
+     IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V2,
+     IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V3},
+    {IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE,
+     IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE_V2,
+     IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE_V3}};
 
 bool IsEligibleForIOSPromotion(
     PrefService* prefs,
     const syncer::SyncService* sync_service,
     desktop_ios_promotion::PromotionEntryPoint entry_point) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceDesktopIOSPromotion)) {
     return true;
   }
 
@@ skipping 43 matching lines @@
   gfx::ImageSkia icon = gfx::CreateVectorIcon(
       kOpenInPhoneIcon, color_utils::DeriveDefaultIconColor(color));
   return icon;
 }
 
 base::string16 GetPromoText(
     desktop_ios_promotion::PromotionEntryPoint entry_point,
     const std::string& phone_number) {
   int text_id_from_finch = base::GetFieldTrialParamByFeatureAsInt(
       features::kDesktopIOSPromotion, "body_text_id", 0);
-  int body_text_i10_id = kBodyTextId[text_id_from_finch][!phone_number.empty()];
+  int body_text_i10_id = kBubbleBodyTextWithPhoneNumberId[text_id_from_finch];
   if (phone_number.empty()) {
+    body_text_i10_id = kBubbleBodyTextNoPhoneNumberId[text_id_from_finch];
     return l10n_util::GetStringUTF16(body_text_i10_id)
         .append(base::string16(13, ' '));
   }
   return l10n_util::GetStringFUTF16(body_text_i10_id,
                                     base::UTF8ToUTF16(phone_number));
 }
 
 base::string16 GetPromoTitle(
     desktop_ios_promotion::PromotionEntryPoint entry_point) {
   int text_id_from_finch = base::GetFieldTrialParamByFeatureAsInt(
       features::kDesktopIOSPromotion, "title_text_id", 0);
-  return l10n_util::GetStringUTF16(kTitleTextId[text_id_from_finch]);
+  return l10n_util::GetStringUTF16(
+      kBubbleTitleTextId[static_cast<int>(entry_point) - 1]

[sky, 2017/03/27 20:03:55]

Don't hardcode the -1, use a constant. And by that I mean defined near the enum
so it's obvious where it comes from.

[mrefaat, 2017/03/29 19:50:18]

used padding instead to keep the consistency

+                        [text_id_from_finch]);
 }
 
 std::string GetSMSID() {
   const std::string default_sms_message_id = "19001507";
   // Get the SMS message id from the finch group.
   std::string finch_sms_id = base::GetFieldTrialParamValueByFeature(
       features::kDesktopIOSPromotion, "sms_id");
   return finch_sms_id.empty() ? default_sms_message_id : finch_sms_id;
 }
 
@@ skipping 59 matching lines @@
               entry_point)]),
       dismissal_reason_min,
       static_cast<int>(PromotionDismissalReason::DISMISSAL_REASON_MAX_VALUE),
       static_cast<int>(PromotionDismissalReason::DISMISSAL_REASON_MAX_VALUE) +
           1,
       base::HistogramBase::kUmaTargetedHistogramFlag)
       ->Add(static_cast<int>(reason));
 }
 
 }  // namespace desktop_ios_promotion