diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 22:30:16 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 22:30:16 +0000 |
| commit | a94fa37aeccca29e274fabf749317fa95b57f20b (patch) | |
| tree | c839ca6f1dd45cb9dee5096f1bb97b71c1d0b0ff /chrome/browser | |
| parent | ce7a1c1b77b669d7c146a2459d731e7d0452671c (diff) | |
| download | chromium_src-a94fa37aeccca29e274fabf749317fa95b57f20b.zip chromium_src-a94fa37aeccca29e274fabf749317fa95b57f20b.tar.gz chromium_src-a94fa37aeccca29e274fabf749317fa95b57f20b.tar.bz2 | |
Revert "Only show the original RWHV or the interstitial page at any time."
It broke ui_tests.
Review URL: http://codereview.chromium.org/112017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/interstitial_page.cc | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index d2e3a19..c0e08e7 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -242,11 +242,11 @@ bool RenderWidgetHostViewGtk::HasFocus() { } void RenderWidgetHostViewGtk::Show() { - gtk_widget_show(view_.get()); + NOTIMPLEMENTED(); } void RenderWidgetHostViewGtk::Hide() { - gtk_widget_hide(view_.get()); + NOTIMPLEMENTED(); } gfx::Rect RenderWidgetHostViewGtk::GetViewBounds() const { diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 0dbe26a..3c3226b 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -200,9 +200,6 @@ void InterstitialPage::Show() { } void InterstitialPage::Hide() { - // Show the original RVH since we're going away. - tab_->render_view_host()->view()->Show(); - render_view_host_->Shutdown(); render_view_host_ = NULL; if (tab_->interstitial_page()) @@ -386,9 +383,6 @@ void InterstitialPage::DidNavigate( if (tab_->render_view_host()->view()->HasFocus()) Focus(); - // Hide the original RVH since we're showing the interstitial instead. - tab_->render_view_host()->view()->Hide(); - // Notify the tab we are not loading so the throbber is stopped. It also // causes a NOTIFY_LOAD_STOP notification, that the AutomationProvider (used // by the UI tests) expects to consider a navigation as complete. Without |