summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc9
-rw-r--r--chrome/browser/tab_contents/tab_contents.h2
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index e8eb9bd..fe4ed7a 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -2244,7 +2244,7 @@ void TabContents::RendererUnresponsive(RenderViewHost* rvh,
if (is_during_unload) {
// Hang occurred while firing the beforeunload/unload handler.
// Pretend the handler fired so tab closing continues as if it had.
- rvh->UnloadListenerHasFired();
+ rvh->set_sudden_termination_allowed(true);
if (!render_manager_.ShouldCloseTabOnUnresponsiveRenderer())
return;
@@ -2326,11 +2326,11 @@ void TabContents::OnFindReply(int request_id,
Details<FindNotificationDetails>(&find_result_));
}
-bool TabContents::CanTerminate() const {
+bool TabContents::IsExternalTabContainer() const {
if (!delegate())
- return true;
+ return false;
- return !delegate()->IsExternalTabContainer();
+ return delegate()->IsExternalTabContainer();
}
void TabContents::FileSelected(const FilePath& path,
@@ -2438,4 +2438,3 @@ void TabContents::Observe(NotificationType type,
NOTREACHED();
}
}
-
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index d45d1dc..4709cab 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -835,7 +835,7 @@ class TabContents : public PageNavigator,
const gfx::Rect& selection_rect,
int active_match_ordinal,
bool final_update);
- virtual bool CanTerminate() const;
+ virtual bool IsExternalTabContainer() const;
// SelectFileDialog::Listener ------------------------------------------------