summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:41:00 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:41:00 +0000
commite7b8d832105e18bfc3789d0a0c5124a34876022c (patch)
treee37a9bced3742133191d86fc0f081f1e1348125d
parent2f28988ebe651238ac9f6e8b33ce6249c32f41bb (diff)
downloadchromium_src-e7b8d832105e18bfc3789d0a0c5124a34876022c.zip
chromium_src-e7b8d832105e18bfc3789d0a0c5124a34876022c.tar.gz
chromium_src-e7b8d832105e18bfc3789d0a0c5124a34876022c.tar.bz2
Replaced HungRendererDialog class with hung_renderer_dialog namespace.
BUG= TEST=trybots Review URL: http://codereview.chromium.org/415006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32697 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/hung_renderer_controller.mm12
-rw-r--r--chrome/browser/gtk/hung_renderer_dialog_gtk.cc9
-rw-r--r--chrome/browser/hung_renderer_dialog.h14
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc8
-rw-r--r--chrome/browser/views/hung_renderer_view.cc10
5 files changed, 29 insertions, 24 deletions
diff --git a/chrome/browser/cocoa/hung_renderer_controller.mm b/chrome/browser/cocoa/hung_renderer_controller.mm
index 6d7eb35..3679747 100644
--- a/chrome/browser/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/cocoa/hung_renderer_controller.mm
@@ -108,7 +108,7 @@ HungRendererController* g_instance = NULL;
- (void)windowWillClose:(NSNotification*)notification {
// We have to reset g_instance before autoreleasing the window,
// because we want to avoid reusing the same dialog if someone calls
- // HungRendererDialog::ShowForTabContents() between the autorelease
+ // hung_renderer_dialog::ShowForTabContents() between the autorelease
// call and the actual dealloc.
g_instance = nil;
@@ -150,8 +150,9 @@ HungRendererController* g_instance = NULL;
}
@end
-// static
-void HungRendererDialog::ShowForTabContents(TabContents* contents) {
+namespace hung_renderer_dialog {
+
+void ShowForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed()) {
if (!g_instance)
g_instance = [[HungRendererController alloc]
@@ -161,7 +162,10 @@ void HungRendererDialog::ShowForTabContents(TabContents* contents) {
}
// static
-void HungRendererDialog::HideForTabContents(TabContents* contents) {
+void HideForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed() && g_instance)
[g_instance endForTabContents:contents];
}
+
+} // namespace hung_renderer_dialog
+
diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
index a5e603d..e10757a 100644
--- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
@@ -204,9 +204,9 @@ void HungRendererDialogGtk::OnDialogResponse(gint response_id) {
} // namespace
+namespace hung_renderer_dialog {
-// static
-void HungRendererDialog::ShowForTabContents(TabContents* contents) {
+void ShowForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed()) {
if (!g_instance)
g_instance = new HungRendererDialogGtk();
@@ -215,7 +215,10 @@ void HungRendererDialog::ShowForTabContents(TabContents* contents) {
}
// static
-void HungRendererDialog::HideForTabContents(TabContents* contents) {
+void HideForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed() && g_instance)
g_instance->EndForTabContents(contents);
}
+
+} // namespace hung_renderer_dialog
+
diff --git a/chrome/browser/hung_renderer_dialog.h b/chrome/browser/hung_renderer_dialog.h
index e5c3b82..6fcc33d 100644
--- a/chrome/browser/hung_renderer_dialog.h
+++ b/chrome/browser/hung_renderer_dialog.h
@@ -5,17 +5,11 @@
#ifndef CHROME_BROWSER_HUNG_RENDERER_DIALOG_H_
#define CHROME_BROWSER_HUNG_RENDERER_DIALOG_H_
-#include "base/basictypes.h"
-
class TabContents;
-class HungRendererDialog {
- public:
- static void ShowForTabContents(TabContents* contents);
- static void HideForTabContents(TabContents* contents);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HungRendererDialog);
-};
+namespace hung_renderer_dialog {
+ void ShowForTabContents(TabContents* contents);
+ void HideForTabContents(TabContents* contents);
+} // namespace hung_renderer_dialog
#endif // CHROME_BROWSER_HUNG_RENDERER_DIALOG_H_
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 0251f03..48b7cb6 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -319,7 +319,7 @@ TabContents::~TabContents() {
}
NotifyDisconnected();
- HungRendererDialog::HideForTabContents(this);
+ hung_renderer_dialog::HideForTabContents(this);
// First cleanly close all child windows.
// TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
@@ -1954,7 +1954,7 @@ void TabContents::RenderViewGone(RenderViewHost* rvh) {
view_->OnTabCrashed();
// Hide any visible hung renderer warning for this web contents' process.
- HungRendererDialog::HideForTabContents(this);
+ hung_renderer_dialog::HideForTabContents(this);
}
void TabContents::RenderViewDeleted(RenderViewHost* rvh) {
@@ -2423,11 +2423,11 @@ void TabContents::RendererUnresponsive(RenderViewHost* rvh,
}
if (render_view_host() && render_view_host()->IsRenderViewLive())
- HungRendererDialog::ShowForTabContents(this);
+ hung_renderer_dialog::ShowForTabContents(this);
}
void TabContents::RendererResponsive(RenderViewHost* render_view_host) {
- HungRendererDialog::HideForTabContents(this);
+ hung_renderer_dialog::HideForTabContents(this);
}
void TabContents::LoadStateChanged(const GURL& url,
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index d73a0fc..6fd0171 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -438,8 +438,9 @@ static HungRendererDialogView* CreateHungRendererDialogView() {
return cv;
}
-// static
-void HungRendererDialog::ShowForTabContents(TabContents* contents) {
+namespace hung_renderer_dialog {
+
+void ShowForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed()) {
if (!g_instance)
g_instance = CreateHungRendererDialogView();
@@ -448,7 +449,10 @@ void HungRendererDialog::ShowForTabContents(TabContents* contents) {
}
// static
-void HungRendererDialog::HideForTabContents(TabContents* contents) {
+void HideForTabContents(TabContents* contents) {
if (!logging::DialogsAreSuppressed() && g_instance)
g_instance->EndForTabContents(contents);
}
+
+} // namespace hung_renderer_dialog
+