summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-26 02:22:29 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-26 02:22:29 +0000
commit7ec6bef94c6ff8e911fe1a7590191fbf78871bf3 (patch)
tree8b280f8a7a310e78938dbb8c94ff5864cace018c /content
parent7df1d1a5e09f0b4cbdafeddeb792960c91b31f31 (diff)
downloadchromium_src-7ec6bef94c6ff8e911fe1a7590191fbf78871bf3.zip
chromium_src-7ec6bef94c6ff8e911fe1a7590191fbf78871bf3.tar.gz
chromium_src-7ec6bef94c6ff8e911fe1a7590191fbf78871bf3.tar.bz2
Get rid of hung_renderer_dialog file and namespace.
Instead move the methods into browser_dialogs.h and rename them. ShowForTabContents -> ShowHungRendererDialog HideForTabContents -> HideHungRendererDialog. BUG=None TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6588002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index a159e8f..eec5a35 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -36,7 +36,6 @@
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/hung_renderer_dialog.h"
#include "chrome/browser/load_from_memory_cache_details.h"
#include "chrome/browser/load_notification_details.h"
#include "chrome/browser/metrics/metric_event_duration_details.h"
@@ -59,6 +58,7 @@
#include "chrome/browser/tab_contents/thumbnail_generator.h"
#include "chrome/browser/translate/page_translated_details.h"
#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
+#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/bindings_policy.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/content_restriction.h"
@@ -344,7 +344,7 @@ TabContents::~TabContents() {
pref_change_registrar_.RemoveAll();
NotifyDisconnected();
- hung_renderer_dialog::HideForTabContents(this);
+ browser::HideHungRendererDialog(this);
// First cleanly close all child windows.
// TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
@@ -2113,7 +2113,7 @@ void TabContents::RenderViewGone(RenderViewHost* rvh,
view_->OnTabCrashed(status, error_code);
// Hide any visible hung renderer warning for this web contents' process.
- hung_renderer_dialog::HideForTabContents(this);
+ browser::HideHungRendererDialog(this);
}
void TabContents::RenderViewDeleted(RenderViewHost* rvh) {
@@ -2567,12 +2567,12 @@ void TabContents::RendererUnresponsive(RenderViewHost* rvh,
if (render_view_host() && render_view_host()->IsRenderViewLive() &&
(!delegate() || delegate()->ShouldShowHungRendererDialog())) {
- hung_renderer_dialog::ShowForTabContents(this);
+ browser::ShowHungRendererDialog(this);
}
}
void TabContents::RendererResponsive(RenderViewHost* render_view_host) {
- hung_renderer_dialog::HideForTabContents(this);
+ browser::HideHungRendererDialog(this);
}
void TabContents::LoadStateChanged(const GURL& url,