Integrate Desktop iOS promotion with bookmarks.

chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.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/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_controller.h"
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/grid_layout.h"
 
-namespace {
-
-int GetDesiredBubbleMaxWidth(
-    desktop_ios_promotion::PromotionEntryPoint entry_point) {
-  if (entry_point ==
-      desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE) {
-    return ManagePasswordsBubbleView::kDesiredBubbleWidth;
-  }
-  return 0;
-}
-
-}  // namespace
-
 DesktopIOSPromotionBubbleView::DesktopIOSPromotionBubbleView(
     Profile* profile,
     desktop_ios_promotion::PromotionEntryPoint entry_point)
     : promotion_text_label_(
           new views::Label(desktop_ios_promotion::GetPromoText(entry_point))),
       promotion_controller_(
           base::MakeUnique<DesktopIOSPromotionController>(profile,
                                                           this,
                                                           entry_point)) {
-  int bubble_width =
-      ::GetDesiredBubbleMaxWidth(promotion_controller_->entry_point());
+  int bubble_width = ManagePasswordsBubbleView::kDesiredBubbleWidth;
   views::GridLayout* layout = new views::GridLayout(this);
   layout->set_minimum_size(gfx::Size(bubble_width, 0));
   SetLayoutManager(layout);
   send_sms_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(IDS_DESKTOP_TO_IOS_PROMO_SEND_TO_PHONE));
   no_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_DESKTOP_TO_IOS_PROMO_NO_THANKS));
   constexpr int kLabelColumnSet = 1;
   views::ColumnSet* column_set = layout->AddColumnSet(kLabelColumnSet);
   column_set->AddPaddingColumn(
@@ skipping 42 matching lines @@
     promotion_controller_->OnNoThanksClicked();
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 void DesktopIOSPromotionBubbleView::UpdateRecoveryPhoneLabel() {
   std::string number = promotion_controller_->GetUsersRecoveryPhoneNumber();
   if (!number.empty()) {
+    promotion_text_label_->GetPreferredSize();
     promotion_text_label_->SetText(desktop_ios_promotion::GetPromoText(
         promotion_controller_->entry_point(), number));
     SizeToPreferredSize();
   }
 }