Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(860)

Side by Side Diff: chrome/browser/ui/views/payments/order_summary_view_controller.cc

Issue 2742813004: [Payments] Refactor into PaymentRequestState and Spec (Closed)
Patch Set: deps fix Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/order_summary_view_controller.h" 5 #include "chrome/browser/ui/views/payments/order_summary_view_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h" 15 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
16 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h" 16 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
17 #include "chrome/browser/ui/views/payments/payment_request_views_util.h" 17 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
18 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
19 #include "components/payments/content/payment_request_spec.h"
19 #include "components/payments/core/currency_formatter.h" 20 #include "components/payments/core/currency_formatter.h"
20 #include "components/strings/grit/components_strings.h" 21 #include "components/strings/grit/components_strings.h"
21 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
22 #include "ui/gfx/font.h" 23 #include "ui/gfx/font.h"
23 #include "ui/views/border.h" 24 #include "ui/views/border.h"
24 #include "ui/views/controls/button/md_text_button.h" 25 #include "ui/views/controls/button/md_text_button.h"
25 #include "ui/views/controls/label.h" 26 #include "ui/views/controls/label.h"
26 #include "ui/views/controls/styled_label.h" 27 #include "ui/views/controls/styled_label.h"
27 #include "ui/views/layout/box_layout.h" 28 #include "ui/views/layout/box_layout.h"
28 #include "ui/views/layout/grid_layout.h" 29 #include "ui/views/layout/grid_layout.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 80
80 return row; 81 return row;
81 } 82 }
82 83
83 } // namespace 84 } // namespace
84 85
85 OrderSummaryViewController::OrderSummaryViewController( 86 OrderSummaryViewController::OrderSummaryViewController(
86 PaymentRequest* request, 87 PaymentRequest* request,
87 PaymentRequestDialogView* dialog) 88 PaymentRequestDialogView* dialog)
88 : PaymentRequestSheetController(request, dialog), pay_button_(nullptr) { 89 : PaymentRequestSheetController(request, dialog), pay_button_(nullptr) {
89 request->AddObserver(this); 90 request->state()->AddObserver(this);
90 } 91 }
91 92
92 OrderSummaryViewController::~OrderSummaryViewController() { 93 OrderSummaryViewController::~OrderSummaryViewController() {
93 request()->RemoveObserver(this); 94 request()->state()->RemoveObserver(this);
94 } 95 }
95 96
96 std::unique_ptr<views::View> OrderSummaryViewController::CreateView() { 97 std::unique_ptr<views::View> OrderSummaryViewController::CreateView() {
97 std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>(); 98 std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
98 99
99 views::BoxLayout* layout = new views::BoxLayout( 100 views::BoxLayout* layout = new views::BoxLayout(
100 views::BoxLayout::kVertical, 0, 0, 0); 101 views::BoxLayout::kVertical, 0, 0, 0);
101 layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START); 102 layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
102 layout->set_cross_axis_alignment( 103 layout->set_cross_axis_alignment(
103 views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH); 104 views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
104 content_view->SetLayoutManager(layout); 105 content_view->SetLayoutManager(layout);
105 106
106 // Set the ID for the first few line items labels, for testing. 107 // Set the ID for the first few line items labels, for testing.
107 const std::vector<DialogViewID> line_items{ 108 const std::vector<DialogViewID> line_items{
108 DialogViewID::ORDER_SUMMARY_LINE_ITEM_1, 109 DialogViewID::ORDER_SUMMARY_LINE_ITEM_1,
109 DialogViewID::ORDER_SUMMARY_LINE_ITEM_2, 110 DialogViewID::ORDER_SUMMARY_LINE_ITEM_2,
110 DialogViewID::ORDER_SUMMARY_LINE_ITEM_3}; 111 DialogViewID::ORDER_SUMMARY_LINE_ITEM_3};
111 for (size_t i = 0; i < request()->details()->display_items.size(); i++) { 112 for (size_t i = 0; i < request()->spec()->details()->display_items.size();
113 i++) {
112 DialogViewID view_id = 114 DialogViewID view_id =
113 i < line_items.size() ? line_items[i] : DialogViewID::VIEW_ID_NONE; 115 i < line_items.size() ? line_items[i] : DialogViewID::VIEW_ID_NONE;
114 content_view->AddChildView( 116 content_view->AddChildView(
115 CreateLineItemView( 117 CreateLineItemView(
116 base::UTF8ToUTF16(request()->details()->display_items[i]->label), 118 base::UTF8ToUTF16(
119 request()->spec()->details()->display_items[i]->label),
117 request()->GetFormattedCurrencyAmount( 120 request()->GetFormattedCurrencyAmount(
118 request()->details()->display_items[i]->amount->value), 121 request()->spec()->details()->display_items[i]->amount->value),
119 false, view_id) 122 false, view_id)
120 .release()); 123 .release());
121 } 124 }
122 125
123 base::string16 total_label_value = l10n_util::GetStringFUTF16( 126 base::string16 total_label_value = l10n_util::GetStringFUTF16(
124 IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT, 127 IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT,
125 base::UTF8ToUTF16(request()->details()->total->amount->currency), 128 base::UTF8ToUTF16(request()->spec()->details()->total->amount->currency),
126 request()->GetFormattedCurrencyAmount( 129 request()->GetFormattedCurrencyAmount(
127 request()->details()->total->amount->value)); 130 request()->spec()->details()->total->amount->value));
128 131
129 content_view->AddChildView( 132 content_view->AddChildView(
130 CreateLineItemView(base::UTF8ToUTF16(request()->details()->total->label), 133 CreateLineItemView(
131 total_label_value, true, 134 base::UTF8ToUTF16(request()->spec()->details()->total->label),
132 DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL) 135 total_label_value, true,
136 DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
133 .release()); 137 .release());
134 138
135 return CreatePaymentView( 139 return CreatePaymentView(
136 CreateSheetHeaderView( 140 CreateSheetHeaderView(
137 true, 141 true,
138 l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_TITLE), 142 l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_TITLE),
139 this), 143 this),
140 std::move(content_view)); 144 std::move(content_view));
141 } 145 }
142 146
143 std::unique_ptr<views::Button> 147 std::unique_ptr<views::Button>
144 OrderSummaryViewController::CreatePrimaryButton() { 148 OrderSummaryViewController::CreatePrimaryButton() {
145 std::unique_ptr<views::Button> button( 149 std::unique_ptr<views::Button> button(
146 views::MdTextButton::CreateSecondaryUiBlueButton( 150 views::MdTextButton::CreateSecondaryUiBlueButton(
147 this, l10n_util::GetStringUTF16(IDS_PAYMENTS_PAY_BUTTON))); 151 this, l10n_util::GetStringUTF16(IDS_PAYMENTS_PAY_BUTTON)));
148 button->set_tag(static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG)); 152 button->set_tag(static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG));
149 button->set_id(static_cast<int>(DialogViewID::PAY_BUTTON)); 153 button->set_id(static_cast<int>(DialogViewID::PAY_BUTTON));
150 pay_button_ = button.get(); 154 pay_button_ = button.get();
151 UpdatePayButtonState(request()->is_ready_to_pay()); 155 UpdatePayButtonState(request()->state()->is_ready_to_pay());
152 return button; 156 return button;
153 } 157 }
154 158
155 void OrderSummaryViewController::OnSelectedInformationChanged() { 159 void OrderSummaryViewController::OnSelectedInformationChanged() {
156 UpdatePayButtonState(request()->is_ready_to_pay()); 160 UpdatePayButtonState(request()->state()->is_ready_to_pay());
157 } 161 }
158 162
159 void OrderSummaryViewController::UpdatePayButtonState(bool enabled) { 163 void OrderSummaryViewController::UpdatePayButtonState(bool enabled) {
160 pay_button_->SetEnabled(enabled); 164 pay_button_->SetEnabled(enabled);
161 } 165 }
162 166
163 } // namespace payments 167 } // namespace payments
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698