Add card details and legal message to Android save credit card infobar.

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

 // Copyright 2015 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/autofill/save_card_bubble_views.h"
 
 #include <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/save_card_bubble_controller.h"
+#include "components/autofill/core/browser/legal_message_line.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 11 matching lines @@
 // TODO(bondd): BubbleManager will eventually move this logic somewhere else,
 // and then kIsOkButtonOnLeftSide can be removed from here and
 // dialog_client_view.cc.
 #if defined(OS_WIN) || defined(OS_CHROMEOS)
 const bool kIsOkButtonOnLeftSide = true;
 #else
 const bool kIsOkButtonOnLeftSide = false;
 #endif
 
 scoped_ptr<views::StyledLabel> CreateLegalMessageLineLabel(
-    const SaveCardBubbleController::LegalMessageLine& line,
+    const LegalMessageLine& line,
     views::StyledLabelListener* listener) {
   scoped_ptr<views::StyledLabel> label(
-      new views::StyledLabel(line.text, listener));
-  for (const SaveCardBubbleController::LegalMessageLine::Link& link :
-       line.links) {
+      new views::StyledLabel(line.text(), listener));
+  for (const LegalMessageLine::Link& link : line.links()) {
     label->AddStyleRange(link.range,
                          views::StyledLabel::RangeStyleInfo::CreateForLink());
   }
   return label;
 }
 
 }  // namespace
 
 SaveCardBubbleViews::SaveCardBubbleViews(views::View* anchor_view,
                                          content::WebContents* web_contents,
@@ skipping 55 matching lines @@
                                                  const gfx::Range& range,
                                                  int event_flags) {
   // Index of |label| within its parent's view hierarchy is the same as the
   // legal message line index. DCHECK this assumption to guard against future
   // layout changes.
   DCHECK_EQ(static_cast<size_t>(label->parent()->child_count()),
             controller_->GetLegalMessageLines().size());
 
   const auto& links =
       controller_->GetLegalMessageLines()[label->parent()->GetIndexOf(label)]
-          .links;
-  for (const SaveCardBubbleController::LegalMessageLine::Link& link : links) {
+          .links();
+  for (const LegalMessageLine::Link& link : links) {
     if (link.range == range) {
       controller_->OnLegalMessageLinkClicked(link.url);
       return;
     }
   }
 
   // |range| was not found.
   NOTREACHED();
 }
 
@@ skipping 85 matching lines @@
   view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical,
                            GetBubbleFrameView()->GetTitleInsets().left(),
                            views::kRelatedControlVerticalSpacing, 0));
   view->SetBorder(
       views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kSubtleBorderColor));
   view->set_background(
       views::Background::CreateSolidBackground(kLightShadingColor));
 
   // Add a StyledLabel for each line of the legal message.
-  for (const SaveCardBubbleController::LegalMessageLine& line :
-       controller_->GetLegalMessageLines()) {
+  for (const LegalMessageLine& line : controller_->GetLegalMessageLines())
     view->AddChildView(CreateLegalMessageLineLabel(line, this).release());
-  }
 
   return view;
 }
 
 void SaveCardBubbleViews::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(CreateMainContentView().release());
   if (!controller_->GetLegalMessageLines().empty())
     AddChildView(CreateFootnoteView().release());
 
   set_margins(gfx::Insets(1, 0, 1, 0));
 }
 
 }  // namespace autofill