Revert 127660 - WebUI TaskManager: Add method to set minimum window size on HTMLDialog.

chrome/browser/ui/views/html_dialog_view.cc

Index: chrome/browser/ui/views/html_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/html_dialog_view.cc	(revision 127670)
+++ chrome/browser/ui/views/html_dialog_view.cc	(working copy)
@@ -76,7 +76,7 @@
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
   if (delegate_)
-    delegate_->GetMinimumDialogSize(&out);
+    delegate_->GetDialogSize(&out);
   return out;
 }
 
@@ -118,12 +118,6 @@
   return string16();
 }
 
-std::string HtmlDialogView::GetWindowName() const {
-  if (delegate_)
-    return delegate_->GetDialogName();
-  return std::string();
-}
-
 void HtmlDialogView::WindowClosing() {
   // If we still have a delegate that means we haven't notified it of the
   // dialog closing. This happens if the user clicks the Close button on the
@@ -182,11 +176,6 @@
     delegate_->GetDialogSize(size);
 }
 
-void HtmlDialogView::GetMinimumDialogSize(gfx::Size* size) const {
-  if (delegate_)
-    delegate_->GetMinimumDialogSize(size);
-}
-
 std::string HtmlDialogView::GetDialogArgs() const {
   if (delegate_)
     return delegate_->GetDialogArgs();
@@ -197,6 +186,7 @@
   HtmlDialogTabContentsDelegate::Detach();
   if (delegate_) {
     HtmlDialogUIDelegate* dialog_delegate = delegate_;
+    delegate_ = NULL;  // We will not communicate further with the delegate.
 
     // Store the dialog content area size.
     dialog_delegate->StoreDialogSize(GetContentsBounds().size());
@@ -204,9 +194,6 @@
     dialog_delegate->OnDialogClosed(json_retval);
   }
   GetWidget()->Close();
-
-  if (delegate_)
-    delegate_ = NULL;  // We will not communicate further with the delegate.
 }
 
 void HtmlDialogView::OnCloseContents(WebContents* source,
@@ -313,13 +300,6 @@
       web_contents->GetPropertyBag(), this);
   tab_watcher_.reset(new TabRenderWatcher(web_contents, this));
 
-  if (delegate_) {
-    gfx::Size out;
-    delegate_->GetDialogSize(&out);
-    if (!out.IsEmpty() && GetWidget())
-      GetWidget()->CenterWindow(out);
-  }
-
   DOMView::LoadURL(GetDialogContentURL());
 }