| 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 // destroyed and we don't supply a Cancel function... | 313 // destroyed and we don't supply a Cancel function... |
| 314 if (window_closing) | 314 if (window_closing) |
| 315 return true; | 315 return true; |
| 316 | 316 |
| 317 // Start waiting again for responsiveness. | 317 // Start waiting again for responsiveness. |
| 318 if (hung_pages_table_model_->GetRenderViewHost()) | 318 if (hung_pages_table_model_->GetRenderViewHost()) |
| 319 hung_pages_table_model_->GetRenderViewHost()->RestartHangMonitorTimeout(); | 319 hung_pages_table_model_->GetRenderViewHost()->RestartHangMonitorTimeout(); |
| 320 return true; | 320 return true; |
| 321 } | 321 } |
| 322 | 322 |
| 323 views::View* HungRendererDialogView::GetContentsView() { | |
| 324 return this; | |
| 325 } | |
| 326 | |
| 327 /////////////////////////////////////////////////////////////////////////////// | 323 /////////////////////////////////////////////////////////////////////////////// |
| 328 // HungRendererDialogView, views::ButtonListener implementation: | 324 // HungRendererDialogView, views::ButtonListener implementation: |
| 329 | 325 |
| 330 void HungRendererDialogView::ButtonPressed( | 326 void HungRendererDialogView::ButtonPressed( |
| 331 views::Button* sender, const ui::Event& event) { | 327 views::Button* sender, const ui::Event& event) { |
| 332 if (sender == kill_button_ && | 328 if (sender == kill_button_ && |
| 333 hung_pages_table_model_->GetRenderProcessHost()) { | 329 hung_pages_table_model_->GetRenderProcessHost()) { |
| 334 | 330 |
| 335 base::ProcessHandle process_handle = | 331 base::ProcessHandle process_handle = |
| 336 hung_pages_table_model_->GetRenderProcessHost()->GetHandle(); | 332 hung_pages_table_model_->GetRenderProcessHost()->GetHandle(); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 } | 468 } |
| 473 | 469 |
| 474 void HideHungRendererDialog(WebContents* contents) { | 470 void HideHungRendererDialog(WebContents* contents) { |
| 475 if (!logging::DialogsAreSuppressed() && | 471 if (!logging::DialogsAreSuppressed() && |
| 476 !PlatformHideCustomHungRendererDialog(contents) && | 472 !PlatformHideCustomHungRendererDialog(contents) && |
| 477 HungRendererDialogView::GetInstance()) | 473 HungRendererDialogView::GetInstance()) |
| 478 HungRendererDialogView::GetInstance()->EndForWebContents(contents); | 474 HungRendererDialogView::GetInstance()->EndForWebContents(contents); |
| 479 } | 475 } |
| 480 | 476 |
| 481 } // namespace chrome | 477 } // namespace chrome |
| OLD | NEW |