summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 16:00:00 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 16:00:00 +0000
commitf61739a5655dfc16f653a027f2ba1567d04a33cb (patch)
tree7e2eb1d4229433c0c5ec6f7fe623e3bd25d9d974
parent77012072572a8678c626cc93e3ba66e06a9236d0 (diff)
downloadchromium_src-f61739a5655dfc16f653a027f2ba1567d04a33cb.zip
chromium_src-f61739a5655dfc16f653a027f2ba1567d04a33cb.tar.gz
chromium_src-f61739a5655dfc16f653a027f2ba1567d04a33cb.tar.bz2
Augment the fix for HungRenderDialogView::ButtonPressed.
We need to check GetRenderProcessHost() (also fixed the typo in the if statement). BUG=http://crbug.com/52293 TEST=None Review URL: http://codereview.chromium.org/3348009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58492 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/hung_renderer_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index e146b89..775623e 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -318,7 +318,7 @@ views::View* HungRendererDialogView::GetContentsView() {
void HungRendererDialogView::ButtonPressed(
views::Button* sender, const views::Event& event) {
if (sender == kill_button_) {
- if (!contents_) {
+ if (contents_ && contents_->GetRenderProcessHost()) {
// Kill the process.
TerminateProcess(contents_->GetRenderProcessHost()->GetHandle(),
ResultCodes::HUNG);