| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/constrained_html_ui.h" | 5 #include "chrome/browser/ui/webui/constrained_html_ui.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" | 8 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" |
| 9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 ConstrainedHtmlDelegateGtk::ConstrainedHtmlDelegateGtk( | 87 ConstrainedHtmlDelegateGtk::ConstrainedHtmlDelegateGtk( |
| 88 Profile* profile, | 88 Profile* profile, |
| 89 HtmlDialogUIDelegate* delegate) | 89 HtmlDialogUIDelegate* delegate) |
| 90 : views::NativeWidgetGtk(new views::Widget), | 90 : views::NativeWidgetGtk(new views::Widget), |
| 91 HtmlDialogTabContentsDelegate(profile), | 91 HtmlDialogTabContentsDelegate(profile), |
| 92 tab_container_(NULL), | 92 tab_container_(NULL), |
| 93 html_delegate_(delegate), | 93 html_delegate_(delegate), |
| 94 window_(NULL), | 94 window_(NULL), |
| 95 closed_via_webui_(false) { | 95 closed_via_webui_(false), |
| 96 release_tab_on_close_(false) { |
| 96 CHECK(delegate); | 97 CHECK(delegate); |
| 97 TabContents* tab_contents = | 98 TabContents* tab_contents = |
| 98 new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL, NULL); | 99 new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL, NULL); |
| 99 html_tab_contents_.reset(new TabContentsWrapper(tab_contents)); | 100 html_tab_contents_.reset(new TabContentsWrapper(tab_contents)); |
| 100 tab_contents->set_delegate(this); | 101 tab_contents->set_delegate(this); |
| 101 | 102 |
| 102 // Set |this| as a property so the ConstrainedHtmlUI can retrieve it. | 103 // Set |this| as a property so the ConstrainedHtmlUI can retrieve it. |
| 103 ConstrainedHtmlUI::GetPropertyAccessor().SetProperty( | 104 ConstrainedHtmlUI::GetPropertyAccessor().SetProperty( |
| 104 tab_contents->property_bag(), this); | 105 tab_contents->property_bag(), this); |
| 105 tab_contents->controller().LoadURL(delegate->GetDialogContentURL(), GURL(), | 106 tab_contents->controller().LoadURL(delegate->GetDialogContentURL(), GURL(), |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 Profile* profile, | 141 Profile* profile, |
| 141 HtmlDialogUIDelegate* delegate, | 142 HtmlDialogUIDelegate* delegate, |
| 142 TabContentsWrapper* wrapper) { | 143 TabContentsWrapper* wrapper) { |
| 143 ConstrainedHtmlDelegateGtk* constrained_delegate = | 144 ConstrainedHtmlDelegateGtk* constrained_delegate = |
| 144 new ConstrainedHtmlDelegateGtk(profile, delegate); | 145 new ConstrainedHtmlDelegateGtk(profile, delegate); |
| 145 ConstrainedWindow* constrained_window = | 146 ConstrainedWindow* constrained_window = |
| 146 new ConstrainedWindowGtk(wrapper, constrained_delegate); | 147 new ConstrainedWindowGtk(wrapper, constrained_delegate); |
| 147 constrained_delegate->set_window(constrained_window); | 148 constrained_delegate->set_window(constrained_window); |
| 148 return constrained_delegate; | 149 return constrained_delegate; |
| 149 } | 150 } |
| OLD | NEW |