[Web Payments] Fix alignment of certain Payment Sheet labels.

chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

 // Copyright 2016 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/payments/payment_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 521 matching lines @@
 
   const std::vector<mojom::PaymentItemPtr>& items =
       spec()->details().display_items;
   // The inline items section contains the first 2 display items of the
   // request's details, followed by a label indicating "N more items..." if
   // there are more than 2 items in the details. The total label and amount
   // always follow.
   constexpr int kMaxNumberOfItemsShown = 2;
   for (size_t i = 0; i < items.size() && i < kMaxNumberOfItemsShown; ++i) {
     item_summaries_layout->StartRow(0, 0);
-    item_summaries_layout->AddView(
-        new views::Label(base::UTF8ToUTF16(items[i]->label)));
+    std::unique_ptr<views::Label> summary =
+        base::MakeUnique<views::Label>(base::UTF8ToUTF16(items[i]->label));
+    summary->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    item_summaries_layout->AddView(summary.release());
 
     item_amounts_layout->StartRow(0, 0);
     item_amounts_layout->AddView(new views::Label(
         spec()->GetFormattedCurrencyAmount(items[i]->amount->value)));
   }
 
   int hidden_item_count = items.size() - kMaxNumberOfItemsShown;
   if (hidden_item_count > 0) {
     item_summaries_layout->StartRow(0, 0);
     std::unique_ptr<views::Label> label =
@@ skipping 128 matching lines @@
   if (selected_instrument) {
     std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
     views::GridLayout* layout = new views::GridLayout(content_view.get());
     content_view->SetLayoutManager(layout);
     views::ColumnSet* columns = layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                        1, views::GridLayout::USE_PREF, 0, 0);
 
     layout->StartRow(0, 0);
-    layout->AddView(new views::Label(selected_instrument->label()));
+    std::unique_ptr<views::Label> selected_instrument_label =
+        base::MakeUnique<views::Label>(selected_instrument->label());
+    selected_instrument_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    layout->AddView(selected_instrument_label.release());
+
     layout->StartRow(0, 0);
-    layout->AddView(new views::Label(selected_instrument->sublabel()));
+    std::unique_ptr<views::Label> selected_instrument_sublabel =
+        base::MakeUnique<views::Label>(selected_instrument->sublabel());
+    selected_instrument_sublabel->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    layout->AddView(selected_instrument_sublabel.release());
 
     std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
         selected_instrument->icon_resource_id(), selected_instrument->label());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
 
     return builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION)
         .CreateWithChevron(std::move(content_view), std::move(card_icon_view));
   } else {
     builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION_BUTTON);
     base::string16 button_string = state()->available_instruments().size()
@@ skipping 140 matching lines @@
   } else {
     return builder
         .Id(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)
         .CreateWithButton(
             l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CHOOSE_AN_ADDRESS),
             l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/false);
   }
 }
 
 }  // namespace payments