diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 20:25:14 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 20:25:14 +0000 |
| commit | e3690ed3662cf26f2231a6495cdc4f21ec3fb116 (patch) | |
| tree | 6cad2d56d101723e27dd17ae00920d9603f26dae /chrome/browser/ui/gtk/html_dialog_gtk.cc | |
| parent | edc1ba641c9e0ace8b05d306638379d22e5be8f1 (diff) | |
| download | chromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.zip chromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.tar.gz chromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.tar.bz2 | |
Moves instant related methods off TabContents and to where they are used.
R=estade@chromium.org,avi@chromium.org
BUG=77091
TEST=none
Review URL: http://codereview.chromium.org/6729010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/html_dialog_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/html_dialog_gtk.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc index fef05dd..2b8183c 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc @@ -10,6 +10,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" @@ -129,17 +130,17 @@ void HtmlDialogGtk::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { // HtmlDialogGtk: gfx::NativeWindow HtmlDialogGtk::InitDialog() { - tab_contents_.reset( - new TabContents(profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)); - tab_contents_->set_delegate(this); + tab_.reset(new TabContentsWrapper( + new TabContents(profile(), NULL, MSG_ROUTING_NONE, NULL, NULL))); + tab_->tab_contents()->set_delegate(this); // This must be done before loading the page; see the comments in // HtmlDialogUI. - HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), - this); + HtmlDialogUI::GetPropertyAccessor().SetProperty( + tab_->tab_contents()->property_bag(), this); - tab_contents_->controller().LoadURL(GetDialogContentURL(), - GURL(), PageTransition::START_PAGE); + tab_->controller().LoadURL(GetDialogContentURL(), + GURL(), PageTransition::START_PAGE); GtkDialogFlags flags = GTK_DIALOG_NO_SEPARATOR; if (delegate_->IsDialogModal()) flags = static_cast<GtkDialogFlags>(flags | GTK_DIALOG_MODAL); @@ -156,7 +157,7 @@ gfx::NativeWindow HtmlDialogGtk::InitDialog() { gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), tab_contents_container_->widget(), TRUE, TRUE, 0); - tab_contents_container_->SetTabContents(tab_contents_.get()); + tab_contents_container_->SetTab(tab_.get()); gfx::Size dialog_size; delegate_->GetDialogSize(&dialog_size); |