Fix the sizing of the constrained dialog on windows. For correct behavior it needs to be set through GetPreferredSize().

BUG=57885
TEST=see bug

Review URL: http://codereview.chromium.org/4172003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63995 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/views/constrained_html_delegate_win.cc b/chrome/browser/views/constrained_html_delegate_win.cc
index 6a4ea77..1ebff45 100644
--- a/chrome/browser/views/constrained_html_delegate_win.cc
+++ b/chrome/browser/views/constrained_html_delegate_win.cc
@@ -24,9 +24,6 @@ class ConstrainedHtmlDelegateWin : public TabContentsContainer,
                              HtmlDialogUIDelegate* delegate);
   ~ConstrainedHtmlDelegateWin();
 
-  // Called when the dialog is actually being added to the views hierarchy.
-  void Init(gfx::NativeView parent_window);
-
   // ConstrainedHtmlUIDelegate interface.
   virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate();
   virtual void OnDialogClose();
@@ -44,15 +41,18 @@ class ConstrainedHtmlDelegateWin : public TabContentsContainer,
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {}
 
   // Overridden from TabContentsContainer.
+  virtual gfx::Size GetPreferredSize() {
+    gfx::Size size;
+    html_delegate_->GetDialogSize(&size);
+    return size;
+  }
+
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) {
     TabContentsContainer::ViewHierarchyChanged(is_add, parent, child);
     if (is_add && child == this) {
       ChangeTabContents(&html_tab_contents_);
-      gfx::Size size;
-      html_delegate_->GetDialogSize(&size);
-      SetBounds(x(), y(), size.width(), size.height());
     }
   }