[Web Payments] Respect Harmony dialog width in Payment Request

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

 // Copyright 2017 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_request_sheet_controller.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request.h"
@@ skipping 91 matching lines @@
       CreateSheetHeaderView(ShouldShowHeaderBackArrow(), GetSheetTitle(), this)
           .release());
 
   layout->StartRow(1, 0);
   // |content_view| will go into a views::ScrollView so it needs to be sized now
   // otherwise it'll be sized to the ScrollView's viewport height, preventing
   // the scroll bar from ever being shown.
   pane_ = new views::View;
   views::GridLayout* pane_layout = new views::GridLayout(pane_);
   views::ColumnSet* pane_columns = pane_layout->AddColumnSet(0);
-  pane_columns->AddColumn(
-      views::GridLayout::Alignment::FILL, views::GridLayout::Alignment::LEADING,
-      0, views::GridLayout::SizeType::FIXED, kDialogWidth, kDialogWidth);
+  pane_columns->AddColumn(views::GridLayout::Alignment::FILL,
+                          views::GridLayout::Alignment::LEADING, 0,
+                          views::GridLayout::SizeType::FIXED,
+                          GetActualDialogWidth(), GetActualDialogWidth());
   pane_->SetLayoutManager(pane_layout);
   pane_layout->StartRow(0, 0);
   // This is owned by its parent. It's the container passed to FillContentView.
   content_view_ = new views::View;
   pane_layout->AddView(content_view_);
   pane_->SizeToPreferredSize();
 
   scroll_ = base::MakeUnique<views::ScrollView>();
   scroll_->set_owned_by_client();
   scroll_->EnableViewPortLayer();
@@ skipping 50 matching lines @@
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
   button->set_id(static_cast<int>(DialogViewID::CANCEL_BUTTON));
   trailing_buttons_container->AddChildView(button);
 
   layout->AddView(trailing_buttons_container.release());
 
   return container;
 }
 
 }  // namespace payments