Use set_fixed_width() in native_file_system/

Also replaces some overrides with simple setters of title, modality and
close button.

Bug: 1128500
Change-Id: I2829525532d1690656b97fc770b2b62324fe7c22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511254
Auto-Submit: Peter Boström <pbos@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823454}

chrome/browser/ui/views/native_file_system/native_file_system_permission_view.cc

@@ -78,6 +78,11 @@ NativeFileSystemPermissionView::NativeFileSystemPermissionView(
   SetCloseCallback(base::BindOnce(run_callback, base::Unretained(this),
                                   permissions::PermissionAction::DISMISSED));
 
+  SetModalType(ui::MODAL_TYPE_CHILD);
+  SetShowCloseButton(false);
+  set_fixed_width(views::LayoutProvider::Get()->GetDistanceMetric(
+      views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH));
+
   const views::LayoutProvider* provider = ChromeLayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical,
@@ -134,21 +139,6 @@ base::string16 NativeFileSystemPermissionView::GetWindowTitle() const {
   NOTREACHED();
 }
 
-bool NativeFileSystemPermissionView::ShouldShowCloseButton() const {
-  return false;
-}
-
-gfx::Size NativeFileSystemPermissionView::CalculatePreferredSize() const {
-  const int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
-                        views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH) -
-                    margins().width();
-  return gfx::Size(width, GetHeightForWidth(width));
-}
-
-ui::ModalType NativeFileSystemPermissionView::GetModalType() const {
-  return ui::MODAL_TYPE_CHILD;
-}
-
 views::View* NativeFileSystemPermissionView::GetInitiallyFocusedView() {
   return GetCancelButton();
 }

chrome/browser/ui/views/native_file_system/native_file_system_permission_view.h

@@ -41,9 +41,6 @@ class NativeFileSystemPermissionView : public views::DialogDelegateView {
 
   // views::DialogDelegateView:
   base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
-  gfx::Size CalculatePreferredSize() const override;
-  ui::ModalType GetModalType() const override;
   views::View* GetInitiallyFocusedView() override;
 
  private:

chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view.cc

@@ -39,32 +39,6 @@ views::Widget* NativeFileSystemRestrictedDirectoryDialogView::ShowDialog(
                                                      web_contents);
 }
 
-base::string16 NativeFileSystemRestrictedDirectoryDialogView::GetWindowTitle()
-    const {
-  return l10n_util::GetStringUTF16(
-      handle_type_ == HandleType::kDirectory
-          ? IDS_NATIVE_FILE_SYSTEM_RESTRICTED_DIRECTORY_TITLE
-          : IDS_NATIVE_FILE_SYSTEM_RESTRICTED_FILE_TITLE);
-}
-
-bool NativeFileSystemRestrictedDirectoryDialogView::ShouldShowCloseButton()
-    const {
-  return false;
-}
-
-gfx::Size
-NativeFileSystemRestrictedDirectoryDialogView::CalculatePreferredSize() const {
-  const int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
-                        views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH) -
-                    margins().width();
-  return gfx::Size(width, GetHeightForWidth(width));
-}
-
-ui::ModalType NativeFileSystemRestrictedDirectoryDialogView::GetModalType()
-    const {
-  return ui::MODAL_TYPE_CHILD;
-}
-
 NativeFileSystemRestrictedDirectoryDialogView::
     NativeFileSystemRestrictedDirectoryDialogView(
         const url::Origin& origin,
@@ -72,6 +46,9 @@ NativeFileSystemRestrictedDirectoryDialogView::
         content::NativeFileSystemPermissionContext::HandleType handle_type,
         base::OnceCallback<void(SensitiveDirectoryResult)> callback)
     : handle_type_(handle_type), callback_(std::move(callback)) {
+  SetTitle(handle_type_ == HandleType::kDirectory
+               ? IDS_NATIVE_FILE_SYSTEM_RESTRICTED_DIRECTORY_TITLE
+               : IDS_NATIVE_FILE_SYSTEM_RESTRICTED_FILE_TITLE);
   SetButtonLabel(ui::DIALOG_BUTTON_OK,
                  l10n_util::GetStringUTF16(
                      handle_type_ == HandleType::kDirectory
@@ -91,6 +68,11 @@ NativeFileSystemRestrictedDirectoryDialogView::
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
 
+  SetModalType(ui::MODAL_TYPE_CHILD);
+  SetShowCloseButton(false);
+  set_fixed_width(views::LayoutProvider::Get()->GetDistanceMetric(
+      views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH));
+
   AddChildView(native_file_system_ui_helper::CreateOriginLabel(
       handle_type_ == HandleType::kDirectory
           ? IDS_NATIVE_FILE_SYSTEM_RESTRICTED_DIRECTORY_TEXT

chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view.h

@@ -45,12 +45,6 @@ class NativeFileSystemRestrictedDirectoryDialogView
       base::OnceCallback<void(SensitiveDirectoryResult)> callback,
       content::WebContents* web_contents);
 
-  // views::DialogDelegateView:
-  base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
-  gfx::Size CalculatePreferredSize() const override;
-  ui::ModalType GetModalType() const override;
-
  private:
   NativeFileSystemRestrictedDirectoryDialogView(
       const url::Origin& origin,