Autoresize the sign-in email confirmation dialog.

chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.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/webui/signin/signin_email_confirmation_dialog.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Dialog size.
 const int kDialogWidth = 448;
-const int kDialogHeight = 250;
+const int kDialogMinHeight = 200;
+const int kDialogMaxHeight = 700;
 
 // Dialog action key;
 const char kActionKey[] = "action";
 
 // Dialog action values.
 const char kActionCancel[] = "cancel";
 const char kActionCreateNewUser[] = "createNewUser";
 const char kActionStartSync[] = "startSync";
 
 class EmailConfirmationHandler : public content::WebUIMessageHandler {
@@ skipping 32 matching lines @@
     const std::string& email,
     const Callback& callback) {
   content::RecordAction(
       base::UserMetricsAction("Signin_Show_ImportDataPrompt"));
   SigninEmailConfirmationDialog* dialog = new SigninEmailConfirmationDialog(
       contents, profile, last_email, email, callback);
   dialog->Show();
 }
 
 void SigninEmailConfirmationDialog::Show() {
-  dialog_delegate_ = ShowConstrainedWebDialog(profile_, this, web_contents_);
+  gfx::Size minSize(kDialogWidth, kDialogMinHeight);
+  gfx::Size maxSize(kDialogWidth, kDialogMaxHeight);
+  dialog_delegate_ = ShowConstrainedWebDialogWithAutoResize(
+      profile_, this, web_contents_, minSize, maxSize);
 }
 
 ui::ModalType SigninEmailConfirmationDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 base::string16 SigninEmailConfirmationDialog::GetDialogTitle() const {
   return base::string16();
 }
 
 GURL SigninEmailConfirmationDialog::GetDialogContentURL() const {
   return GURL(chrome::kChromeUISigninEmailConfirmationURL);
 }
 
 void SigninEmailConfirmationDialog::GetWebUIMessageHandlers(
     std::vector<content::WebUIMessageHandler*>* handlers) const {
   handlers->push_back(new EmailConfirmationHandler());
 }
 
 void SigninEmailConfirmationDialog::GetDialogSize(gfx::Size* size) const {
-  size->SetSize(kDialogWidth, kDialogHeight);
+  // Avoid setting a dialog size in here as this dialog auto-resizes (see
+  // method |SigninEmailConfirmationDialog::Show|.
 }
 
 std::string SigninEmailConfirmationDialog::GetDialogArgs() const {
   std::string data;
   base::DictionaryValue dialog_args;
   dialog_args.SetString("lastEmail", last_email_);
   dialog_args.SetString("newEmail", new_email_);
   base::JSONWriter::Write(dialog_args, &data);
   return data;
 }
@@ skipping 32 matching lines @@
 
 void SigninEmailConfirmationDialog::OnCloseContents(
     content::WebContents* source,
     bool* out_close_dialog) {
   *out_close_dialog = true;
 }
 
 bool SigninEmailConfirmationDialog::ShouldShowDialogTitle() const {
   return false;
 }