Chromium Code Reviews| Index: chrome/browser/ui/views/autofill/save_card_bubble_views.cc |
| diff --git a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc |
| index 41e7293b0e1d89305421c131a973c3d64f291a1e..273335b9017f53549c6ea27448e3064821ff3c57 100644 |
| --- a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc |
| +++ b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc |
| @@ -10,6 +10,7 @@ |
| #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" |
| @@ -41,12 +42,11 @@ 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()); |
| } |
| @@ -122,8 +122,8 @@ void SaveCardBubbleViews::StyledLabelLinkClicked(views::StyledLabel* label, |
| 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; |
| @@ -229,10 +229,8 @@ scoped_ptr<views::View> SaveCardBubbleViews::CreateFootnoteView() { |
| views::Background::CreateSolidBackground(kLightShadingColor)); |
| // Add a StyledLabel for each line of the legal message. |
| - for (const SaveCardBubbleController::LegalMessageLine& line : |
| - controller_->GetLegalMessageLines()) { |
| - view->AddChildView(CreateLegalMessageLineLabel(line, this).release()); |
| - } |
| + for (const auto& line : controller_->GetLegalMessageLines()) |
|
Evan Stade
2016/01/13 04:09:19
remove auto
please use gerrit instead
2016/01/13 21:22:09
Done.
Peter Kasting
2016/01/13 22:10:25
Seems like we debated this already?: https://coder
Evan Stade
2016/01/13 22:52:40
Yes, we did, and I abandoned the debate because I
Peter Kasting
2016/01/13 23:25:31
The previous debate was about this same line in th
please use gerrit instead
2016/01/14 02:39:40
Now that LegalMessageLines is a plain old std::vec
Peter Kasting
2016/01/14 04:19:24
Yeah, in that situation I think we're good without
|
| + view->AddChildView(CreateLegalMessageLineLabel(*line, this).release()); |
| return view; |
| } |