diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 17:53:26 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 17:53:26 +0000 |
| commit | 8897c38c5cf3f8e9fe30e736fac30bce3a96844c (patch) | |
| tree | 1cf3e9d2f06ccf9e5fdd388b56329e77cc3f8a4b /chrome/browser/tab_contents | |
| parent | a2f7f16c5f4ed45c3b5412499fa42ec964ed2791 (diff) | |
| download | chromium_src-8897c38c5cf3f8e9fe30e736fac30bce3a96844c.zip chromium_src-8897c38c5cf3f8e9fe30e736fac30bce3a96844c.tar.gz chromium_src-8897c38c5cf3f8e9fe30e736fac30bce3a96844c.tar.bz2 | |
Refactor view from methods to show hung renderer dialog.
This moves the methods into a header that all platforms
can use and keeps the windows implementation in
hung_renderer_view.cc.
Review URL: http://codereview.chromium.org/109039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15424 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 995447d..743e1bd 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -24,6 +24,7 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/gears_integration.h" #include "chrome/browser/google_util.h" +#include "chrome/browser/hung_renderer_dialog.h" #include "chrome/browser/jsmessage_box_handler.h" #include "chrome/browser/load_from_memory_cache_details.h" #include "chrome/browser/load_notification_details.h" @@ -43,6 +44,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" @@ -54,12 +56,9 @@ #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/views/blocked_popup_container.h" #include "chrome/browser/views/download_started_animation.h" -#include "chrome/browser/views/hung_renderer_view.h" // TODO(brettw) delete me. #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #endif -#include "grit/generated_resources.h" - // Cross-Site Navigations // // If a TabContents is told to navigate to a different web site (as determined @@ -296,7 +295,7 @@ TabContents::~TabContents() { view_->OnContentsDestroy(); NotifyDisconnected(); - HungRendererWarning::HideForTabContents(AsWC(this)); + HungRendererDialog::HideForTabContents(AsWC(this)); if (pending_install_.callback_functor) pending_install_.callback_functor->Cancel(); @@ -1663,7 +1662,7 @@ void TabContents::RenderViewGone(RenderViewHost* rvh) { view_->Invalidate(); // Hide any visible hung renderer warning for this web contents' process. - HungRendererWarning::HideForTabContents(AsWC(this)); + HungRendererDialog::HideForTabContents(AsWC(this)); } void TabContents::DidNavigate(RenderViewHost* rvh, @@ -2257,11 +2256,11 @@ void TabContents::RendererUnresponsive(RenderViewHost* rvh, } if (render_view_host() && render_view_host()->IsRenderViewLive()) - HungRendererWarning::ShowForTabContents(AsWC(this)); + HungRendererDialog::ShowForTabContents(AsWC(this)); } void TabContents::RendererResponsive(RenderViewHost* render_view_host) { - HungRendererWarning::HideForTabContents(AsWC(this)); + HungRendererDialog::HideForTabContents(AsWC(this)); } void TabContents::LoadStateChanged(const GURL& url, |