| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/hung_renderer_view.h" | 5 #include "chrome/browser/ui/views/hung_renderer_view.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) && !defined(USE_AURA) | 7 #if defined(OS_WIN) && !defined(USE_AURA) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 delegate_->TabDestroyed(); | 151 delegate_->TabDestroyed(); |
| 152 // WARNING: we've likely been deleted. | 152 // WARNING: we've likely been deleted. |
| 153 } | 153 } |
| 154 | 154 |
| 155 HungPagesTableModel::WebContentsObserverImpl::WebContentsObserverImpl( | 155 HungPagesTableModel::WebContentsObserverImpl::WebContentsObserverImpl( |
| 156 HungPagesTableModel* model, WebContents* tab) | 156 HungPagesTableModel* model, WebContents* tab) |
| 157 : content::WebContentsObserver(tab), | 157 : content::WebContentsObserver(tab), |
| 158 model_(model) { | 158 model_(model) { |
| 159 } | 159 } |
| 160 | 160 |
| 161 void HungPagesTableModel::WebContentsObserverImpl::RenderViewGone( | 161 void HungPagesTableModel::WebContentsObserverImpl::RenderProcessGone( |
| 162 base::TerminationStatus status) { | 162 base::TerminationStatus status) { |
| 163 model_->TabDestroyed(this); | 163 model_->TabDestroyed(this); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void HungPagesTableModel::WebContentsObserverImpl::WebContentsDestroyed( | 166 void HungPagesTableModel::WebContentsObserverImpl::WebContentsDestroyed( |
| 167 WebContents* tab) { | 167 WebContents* tab) { |
| 168 model_->TabDestroyed(this); | 168 model_->TabDestroyed(this); |
| 169 } | 169 } |
| 170 | 170 |
| 171 /////////////////////////////////////////////////////////////////////////////// | 171 /////////////////////////////////////////////////////////////////////////////// |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 } | 450 } |
| 451 | 451 |
| 452 void HideHungRendererDialog(WebContents* contents) { | 452 void HideHungRendererDialog(WebContents* contents) { |
| 453 if (!logging::DialogsAreSuppressed() && | 453 if (!logging::DialogsAreSuppressed() && |
| 454 !PlatformHideCustomHungRendererDialog(contents) && | 454 !PlatformHideCustomHungRendererDialog(contents) && |
| 455 HungRendererDialogView::GetInstance()) | 455 HungRendererDialogView::GetInstance()) |
| 456 HungRendererDialogView::GetInstance()->EndForWebContents(contents); | 456 HungRendererDialogView::GetInstance()->EndForWebContents(contents); |
| 457 } | 457 } |
| 458 | 458 |
| 459 } // namespace chrome | 459 } // namespace chrome |
| OLD | NEW |