Refactor ExtensionDialog::InitParams to use gfx::Size

Follow up work from CL:2126340.

Fix #include problems pointed by "git cl lint".

Bug: 1064822
Change-Id: Ia393c4f82601007e198d37ae9a7fcb1aae915bf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148980
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759869}

chrome/browser/ui/views/extensions/extension_dialog.cc

@@ -37,8 +37,8 @@
 using content::BrowserContext;
 using content::WebContents;
 
-ExtensionDialog::InitParams::InitParams(int width, int height)
-    : width(width), height(height) {}
+ExtensionDialog::InitParams::InitParams(gfx::Size size)
+    : size(std::move(size)) {}
 ExtensionDialog::InitParams::InitParams(const InitParams& other) = default;
 ExtensionDialog::InitParams::~InitParams() = default;
 
@@ -56,9 +56,8 @@ ExtensionDialog* ExtensionDialog::Show(const GURL& url,
   // Preferred size must be set before views::Widget::CreateWindowWithParent()
   // is called because CreateWindowWithParent() references CanResize().
   ExtensionViewViews* view = GetExtensionView(host.get());
-  view->SetPreferredSize(gfx::Size(init_params.width, init_params.height));
-  view->set_minimum_size(
-      gfx::Size(init_params.min_width, init_params.min_height));
+  view->SetPreferredSize(init_params.size);
+  view->set_minimum_size(init_params.min_size);
   host->SetAssociatedWebContents(web_contents);
 
   DCHECK(parent_window);
@@ -214,16 +213,18 @@ void ExtensionDialog::InitWindow(gfx::NativeWindow parent,
   gfx::Rect bounds = parent ? views::Widget::GetWidgetForNativeWindow(parent)
                                   ->GetWindowBoundsInScreen()
                             : screen_rect;
-  bounds.ClampToCenteredSize({init_params.width, init_params.height});
+  bounds.ClampToCenteredSize(init_params.size);
 
-  // Make sure bounds is larger than {min_width, min_height}.
-  if (bounds.width() < init_params.min_width) {
-    bounds.set_x(bounds.x() + (bounds.width() - init_params.min_width) / 2);
-    bounds.set_width(init_params.min_width);
+  // Make sure bounds is larger than {min_size}.
+  if (bounds.width() < init_params.min_size.width()) {
+    bounds.set_x(bounds.x() +
+                 (bounds.width() - init_params.min_size.width()) / 2);
+    bounds.set_width(init_params.min_size.width());
   }
-  if (bounds.height() < init_params.min_height) {
-    bounds.set_y(bounds.y() + (bounds.height() - init_params.min_height) / 2);
-    bounds.set_height(init_params.min_height);
+  if (bounds.height() < init_params.min_size.height()) {
+    bounds.set_y(bounds.y() +
+                 (bounds.height() - init_params.min_size.height()) / 2);
+    bounds.set_height(init_params.min_size.height());
   }
 
   // Make sure bounds is still on screen.

chrome/browser/ui/views/extensions/extension_dialog.h

@@ -39,18 +39,21 @@ class ExtensionDialog : public views::DialogDelegate,
                         public base::RefCounted<ExtensionDialog> {
  public:
   struct InitParams {
-    InitParams(int width, int height);
+    // |size| Size in DIP (Device Independent Pixel) for the dialog window.
+    explicit InitParams(gfx::Size size);
     InitParams(const InitParams& other);
     ~InitParams();
 
     // |is_modal| determines whether the dialog is modal to |parent_window|.
     bool is_modal = false;
 
-    // |width| and |height| are the size of the dialog in pixels.
-    int width = 0;
-    int height = 0;
-    int min_width = 0;
-    int min_height = 0;
+    // Size in DIP (Device Independent Pixel) for the dialog window.
+    gfx::Size size;
+
+    // Minimum size in DIP (Device Independent Pixel) for the dialog window.
+    gfx::Size min_size;
+
+    // Text for the dialog title, it should be already localized.
     base::string16 title;
 
 #if defined(OS_CHROMEOS)

chrome/browser/ui/views/extensions/extension_dialog_bounds_browsertest.cc

@@ -54,10 +54,9 @@ class ExtensionDialogBoundsTest
 
     // Dimensions of a dialog that would be bigger than the remaining display
     // work area when the docked magnifier is enabled.
-    ExtensionDialog::InitParams params(1000, 1000);
+    ExtensionDialog::InitParams params(gfx::Size(1000, 1000));
     params.is_modal = true;
-    params.min_width = 640;
-    params.min_height = 240;
+    params.min_size = {640, 240};
     auto* dialog = ExtensionDialog::Show(
         extension->url().Resolve("main.html"),
         browser()->window()->GetNativeWindow(), browser()->profile(),

chrome/browser/ui/views/extensions/extension_dialog_browsertest.cc

@@ -8,7 +8,6 @@
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/content_test_utils.h"
-#include "chrome/browser/ui/views/extensions/extension_dialog.h"
 #include "extensions/test/extension_test_message_listener.h"
 
 namespace {
@@ -22,10 +21,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionDialogTest, TextInputViaKeyEvent) {
       LoadExtension(test_data_dir_.AppendASCII("uitest/tab_traversal"));
   ASSERT_TRUE(extension.get());
 
-  ExtensionDialog::InitParams params(400, 300);
+  ExtensionDialog::InitParams params(gfx::Size(400, 300));
   params.is_modal = true;
-  params.min_width = 400;
-  params.min_height = 300;
+  params.min_size = {400, 300};
   auto* dialog = ExtensionDialog::Show(
       extension->url().Resolve("main.html"),
       browser()->window()->GetNativeWindow(), browser()->profile(),

chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc

@@ -44,10 +44,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionDialogUiTest, MAYBE_TabFocusLoop) {
 
   // Open ExtensionDialog, whose initial page is the extension's main.html.
   // The main.html contains three buttons.
-  ExtensionDialog::InitParams params(300, 300);
+  ExtensionDialog::InitParams params(gfx::Size(300, 300));
   params.is_modal = true;
-  params.min_width = 300;
-  params.min_height = 300;
+  params.min_size = {300, 300};
   ExtensionDialog* dialog =
       ExtensionDialog::Show(extension->url().Resolve("main.html"),
                             browser()->window()->GetNativeWindow(),

chrome/browser/ui/views/select_file_dialog_extension.cc

@@ -4,6 +4,11 @@
 
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ -400,11 +405,11 @@ void SelectFileDialogExtension::SelectFileWithFileManagerParams(
           default_path.BaseName().value(), file_types, file_type_index,
           default_extension, show_android_picker_apps);
 
-  ExtensionDialog::InitParams dialog_params(kFileManagerWidth,
-                                            kFileManagerHeight);
+  ExtensionDialog::InitParams dialog_params(
+      {kFileManagerWidth, kFileManagerHeight});
   dialog_params.is_modal = (owner_window != nullptr);
-  dialog_params.min_width = kFileManagerMinimumWidth;
-  dialog_params.min_height = kFileManagerMinimumHeight;
+  dialog_params.min_size = {kFileManagerMinimumWidth,
+                            kFileManagerMinimumHeight};
   dialog_params.title = file_manager::util::GetSelectFileDialogTitle(type);
 #if defined(OS_CHROMEOS)
   if (base::FeatureList::IsEnabled(chromeos::features::kFilesNG)) {