Add new methods to create constrained windows for print preview and release the internal TabConte...

chrome/browser/ui/views/constrained_html_delegate_views.cc

 // Copyright (c) 2011 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/constrained_html_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
@@ skipping 10 matching lines @@
                                      public views::WidgetDelegate,
                                      public HtmlDialogTabContentsDelegate {
  public:
   ConstrainedHtmlDelegateViews(Profile* profile,
                                HtmlDialogUIDelegate* delegate);
   ~ConstrainedHtmlDelegateViews();
 
   // ConstrainedHtmlUIDelegate interface.
   virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() OVERRIDE;
   virtual void OnDialogCloseFromWebUI() OVERRIDE;
+  virtual void ReleaseTabContentsOnDialogClose() OVERRIDE;
+  virtual ConstrainedWindow* window() OVERRIDE { return window_; }
+  virtual TabContentsWrapper* tab() OVERRIDE {
+    return html_tab_contents_.get();
+  }
 
   // views::WidgetDelegate interface.
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
   virtual void WindowClosing() OVERRIDE {
     if (!closed_via_webui_)
       html_delegate_->OnDialogClosed("");
   }
@@ skipping 16 matching lines @@
     gfx::Size size;
     html_delegate_->GetDialogSize(&size);
     return size;
   }
 
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE {
     TabContentsContainer::ViewHierarchyChanged(is_add, parent, child);
     if (is_add && child == this) {
-      ChangeTabContents(&html_tab_contents_);
+      ChangeTabContents(html_tab_contents_->tab_contents());
     }
   }
 
   void set_window(ConstrainedWindow* window) {
     window_ = window;
   }
 
  private:
-  TabContents html_tab_contents_;
+  scoped_ptr<TabContentsWrapper> html_tab_contents_;
 
   HtmlDialogUIDelegate* html_delegate_;
 
   // The constrained window that owns |this|.  Saved so we can close it later.
   ConstrainedWindow* window_;
 
   // Was the dialog closed from WebUI (in which case |html_delegate_|'s
   // OnDialogClosed() method has already been called)?
   bool closed_via_webui_;
+
+  // If true, release |tab_| on close instead of destroying it.
+  bool release_tab_on_close_;
 };
 
 ConstrainedHtmlDelegateViews::ConstrainedHtmlDelegateViews(
     Profile* profile,
     HtmlDialogUIDelegate* delegate)
     : HtmlDialogTabContentsDelegate(profile),
-      html_tab_contents_(profile, NULL, MSG_ROUTING_NONE, NULL, NULL),
       html_delegate_(delegate),
       window_(NULL),
-      closed_via_webui_(false) {
+      closed_via_webui_(false),
+      release_tab_on_close_(false) {
   CHECK(delegate);
-  html_tab_contents_.set_delegate(this);
+  TabContents* tab_contents =
+      new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
+  html_tab_contents_.reset(new TabContentsWrapper(tab_contents));
+  tab_contents->set_delegate(this);
 
   // Set |this| as a property so the ConstrainedHtmlUI can retrieve it.
   ConstrainedHtmlUI::GetPropertyAccessor().SetProperty(
-      html_tab_contents_.property_bag(), this);
-  html_tab_contents_.controller().LoadURL(
-      delegate->GetDialogContentURL(),
-      GURL(),
-      content::PAGE_TRANSITION_START_PAGE,
-      std::string());
+      html_tab_contents_->tab_contents()->property_bag(), this);
+  tab_contents->controller().LoadURL(delegate->GetDialogContentURL(),
+                                     GURL(),
+                                     content::PAGE_TRANSITION_START_PAGE,
+                                     std::string());
 }
 
 ConstrainedHtmlDelegateViews::~ConstrainedHtmlDelegateViews() {
+  if (release_tab_on_close_)
+    ignore_result(html_tab_contents_.release());
 }
 
 HtmlDialogUIDelegate* ConstrainedHtmlDelegateViews::GetHtmlDialogUIDelegate() {
   return html_delegate_;
 }
 
 void ConstrainedHtmlDelegateViews::OnDialogCloseFromWebUI() {
   closed_via_webui_ = true;
   window_->CloseConstrainedWindow();
 }
 
+void ConstrainedHtmlDelegateViews::ReleaseTabContentsOnDialogClose() {
+  release_tab_on_close_ = true;
+}
+
 // static
-ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(
+ConstrainedHtmlUIDelegate* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
     TabContentsWrapper* container) {
   ConstrainedHtmlDelegateViews* constrained_delegate =
       new ConstrainedHtmlDelegateViews(profile, delegate);
   ConstrainedWindow* constrained_window =
       new ConstrainedWindowViews(container, constrained_delegate);
   constrained_delegate->set_window(constrained_window);
-  return constrained_window;
+  return constrained_delegate;
 }