Update the local card migration bubble upon privacy request (F Option)

Changed the title, and added a body text.

Uploaded a screenshot in the bug. Note that the body text color is
incorrect (should be Google Grey 700) due to crbug.com/896891.

Bug: 880809, 897998
Change-Id: I5bf1cf07c6c86bb5a985811485edcb61d14d2610
Reviewed-on: https://chromium-review.googlesource.com/c/1294722Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602451}

chrome/browser/ui/autofill/local_card_migration_bubble_controller_impl.cc

@@ -76,12 +76,6 @@ LocalCardMigrationBubbleControllerImpl::local_card_migration_bubble_view()
   return local_card_migration_bubble_;
 }
 
-base::string16 LocalCardMigrationBubbleControllerImpl::GetBubbleMessage()
-    const {
-  return l10n_util::GetStringUTF16(
-      IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_TITLE);
-}
-
 void LocalCardMigrationBubbleControllerImpl::OnConfirmButtonClicked() {
   DCHECK(local_card_migration_bubble_closure_);
   std::move(local_card_migration_bubble_closure_).Run();

chrome/browser/ui/autofill/local_card_migration_bubble_controller_impl.h

@@ -42,7 +42,6 @@ class LocalCardMigrationBubbleControllerImpl
   LocalCardMigrationBubble* local_card_migration_bubble_view() const;
 
   // LocalCardBubbleController:
-  base::string16 GetBubbleMessage() const override;
   void OnConfirmButtonClicked() override;
   void OnCancelButtonClicked() override;
   void OnBubbleClosed() override;
@@ -87,4 +86,4 @@ class LocalCardMigrationBubbleControllerImpl
 
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_UI_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_CONTROLLER_IMPL_H_
\ No newline at end of file
+#endif  // CHROME_BROWSER_UI_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_CONTROLLER_IMPL_H_

chrome/browser/ui/views/autofill/local_card_migration_bubble_views.cc

@@ -128,10 +128,22 @@ void LocalCardMigrationBubbleViews::WindowClosing() {
 LocalCardMigrationBubbleViews::~LocalCardMigrationBubbleViews() {}
 
 void LocalCardMigrationBubbleViews::Init() {
-  SetLayoutManager(
-      std::make_unique<views::BoxLayout>(views::BoxLayout::kVertical));
-  views::Label* explanatory_message = new views::Label(
-      controller_->GetBubbleMessage(), CONTEXT_BODY_TEXT_LARGE);
+  SetLayoutManager(std::make_unique<views::BoxLayout>(
+      views::BoxLayout::kVertical, gfx::Insets(),
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          DISTANCE_RELATED_CONTROL_VERTICAL_SMALL)));
+
+  auto* title = new views::Label(
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_TITLE),
+      views::style::CONTEXT_DIALOG_TITLE);
+  title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  title->SetMultiLine(true);
+  AddChildView(title);
+
+  auto* explanatory_message = new views::Label(
+      l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BODY_TEXT),
+      CONTEXT_BODY_TEXT_LARGE, ChromeTextStyle::STYLE_SECONDARY);
   explanatory_message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   explanatory_message->SetMultiLine(true);
   AddChildView(explanatory_message);

components/autofill/core/browser/ui/local_card_migration_bubble_controller.h

@@ -20,10 +20,6 @@ class LocalCardMigrationBubbleController {
   LocalCardMigrationBubbleController() {}
   virtual ~LocalCardMigrationBubbleController() {}
 
-  // Returns the explanatory message that should be displayed in the bubble.
-  virtual base::string16 GetBubbleMessage() const = 0;
-
-  // Interaction.
   virtual void OnConfirmButtonClicked() = 0;
   virtual void OnCancelButtonClicked() = 0;
   virtual void OnBubbleClosed() = 0;

components/autofill_strings.grdp

@@ -250,11 +250,14 @@
       Google Pay logo
     </message>
     <message name="IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_TITLE" desc="The title text for a bubble that offers users to start the process of migrating local cards to cloud.">
-      Save all your cards in one place?
+      Save your cards to Google?
     </message>
     <message name="IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BUTTON_LABEL" desc="The text in the OK button of a bubble that offers users to start the process of migration local cards to cloud.">
       Continue
     </message>
+    <message name="IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BODY_TEXT" desc="The body text for a bubble that offers users to start the process of migrating local cards to cloud.">
+      In the next step, you can choose which cards to save to your Google Account.
+    </message>
     <message name="IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TITLE_OFFER" desc="The title text for a dialog that offers to migrate local cards into the cloud.">
       All your cards in one place
     </message>