OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h" | 5 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <memory> | 8 #include <memory> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 } | 145 } |
146 | 146 |
147 if (extra_content_view) { | 147 if (extra_content_view) { |
148 extra_content_view->set_can_process_events_within_subtree(false); | 148 extra_content_view->set_can_process_events_within_subtree(false); |
149 layout->AddView(extra_content_view.release()); | 149 layout->AddView(extra_content_view.release()); |
150 } else { | 150 } else { |
151 layout->SkipColumns(1); | 151 layout->SkipColumns(1); |
152 } | 152 } |
153 | 153 |
154 views::ImageView* chevron = new views::ImageView(); | 154 views::ImageView* chevron = new views::ImageView(); |
155 chevron->set_interactive(false); | 155 chevron->set_can_process_events_within_subtree(false); |
156 chevron->SetImage(gfx::CreateVectorIcon( | 156 chevron->SetImage(gfx::CreateVectorIcon( |
157 views::kSubmenuArrowIcon, | 157 views::kSubmenuArrowIcon, |
158 color_utils::DeriveDefaultIconColor(name_label->enabled_color()))); | 158 color_utils::DeriveDefaultIconColor(name_label->enabled_color()))); |
159 layout->AddView(chevron); | 159 layout->AddView(chevron); |
160 | 160 |
161 return std::move(row); | 161 return std::move(row); |
162 } | 162 } |
163 | 163 |
164 } // namespace | 164 } // namespace |
165 | 165 |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 CreateContactInfoSectionContent(), std::unique_ptr<views::View>(nullptr), | 364 CreateContactInfoSectionContent(), std::unique_ptr<views::View>(nullptr), |
365 widest_name_column_view_width_); | 365 widest_name_column_view_width_); |
366 section->set_tag(static_cast<int>( | 366 section->set_tag(static_cast<int>( |
367 PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON)); | 367 PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON)); |
368 section->set_id( | 368 section->set_id( |
369 static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION)); | 369 static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION)); |
370 return section; | 370 return section; |
371 } | 371 } |
372 | 372 |
373 } // namespace payments | 373 } // namespace payments |
OLD | NEW |