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

chrome/browser/ui/views/html_dialog_view.cc

 // Copyright (c) 2012 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/views/html_dialog_view.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 60 matching lines @@
 
 HtmlDialogView::~HtmlDialogView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::View implementation:
 
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
   if (delegate_)
-    delegate_->GetDialogSize(&out);
+    delegate_->GetMinimumDialogSize(&out);
   return out;
 }
 
 bool HtmlDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // Pressing ESC closes the dialog.
   DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
   OnDialogClosed(std::string());
   return true;
 }
 
@@ skipping 21 matching lines @@
 ui::ModalType HtmlDialogView::GetModalType() const {
   return GetDialogModalType();
 }
 
 string16 HtmlDialogView::GetWindowTitle() const {
   if (delegate_)
     return delegate_->GetDialogTitle();
   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
   // dialog.
   if (delegate_)
     OnDialogClosed("");
 }
 
 views::View* HtmlDialogView::GetContentsView() {
   return this;
@@ skipping 38 matching lines @@
     std::vector<WebUIMessageHandler*>* handlers) const {
   if (delegate_)
     delegate_->GetWebUIMessageHandlers(handlers);
 }
 
 void HtmlDialogView::GetDialogSize(gfx::Size* size) const {
   if (delegate_)
     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();
   return std::string();
 }
 
 void HtmlDialogView::OnDialogClosed(const std::string& json_retval) {
   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());
 
     dialog_delegate->OnDialogClosed(json_retval);
   }
   GetWidget()->Close();
+
+  if (delegate_)

[sky, 2012/03/01 17:01:57]

You sure you don't want to set this to NULL before you invoke Close()?

[yoshiki, 2012/03/02 06:51:10]

Yes, this delegate_ is necessary to save the window placement on closing.

On 2012/03/01 17:01:57, sky wrote:

+    delegate_ = NULL;  // We will not communicate further with the delegate.
 }
 
 void HtmlDialogView::OnCloseContents(WebContents* source,
                                      bool* out_close_dialog) {
   if (delegate_)
     delegate_->OnCloseContents(source, out_close_dialog);
 }
 
 bool HtmlDialogView::ShouldShowDialogTitle() const {
   if (delegate_)
@@ skipping 86 matching lines @@
 
   WebContents* web_contents = dom_contents_->web_contents();
   web_contents->SetDelegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   HtmlDialogUI::GetPropertyAccessor().SetProperty(
       web_contents->GetPropertyBag(), this);
   tab_watcher_.reset(new TabFirstRenderWatcher(web_contents, this));
 
+  if (delegate_) {
+    gfx::Size out;
+    delegate_->GetDialogSize(&out);
+    if (!out.IsEmpty())
+      GetWidget()->SetSizeAndCenterize(out);
+  }
+
   DOMView::LoadURL(GetDialogContentURL());
 }
 
 void HtmlDialogView::RegisterDialogAccelerators() {
   // Pressing the ESC key will close the dialog.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 }
 
 void HtmlDialogView::OnRenderHostCreated(RenderViewHost* host) {
 }
 
 void HtmlDialogView::OnTabMainFrameLoaded() {
 }
 
 void HtmlDialogView::OnTabMainFrameFirstRender() {
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
   if (initialized_) {
     views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
         GTK_WINDOW(GetWidget()->GetNativeView()), false);
   }
 #endif
 }