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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 } | 317 } |
318 | 318 |
319 views::View* HungRendererDialogView::GetContentsView() { | 319 views::View* HungRendererDialogView::GetContentsView() { |
320 return this; | 320 return this; |
321 } | 321 } |
322 | 322 |
323 /////////////////////////////////////////////////////////////////////////////// | 323 /////////////////////////////////////////////////////////////////////////////// |
324 // HungRendererDialogView, views::ButtonListener implementation: | 324 // HungRendererDialogView, views::ButtonListener implementation: |
325 | 325 |
326 void HungRendererDialogView::ButtonPressed( | 326 void HungRendererDialogView::ButtonPressed( |
327 views::Button* sender, const views::Event& event) { | 327 views::Button* sender, const ui::Event& event) { |
328 if (sender == kill_button_ && | 328 if (sender == kill_button_ && |
329 hung_pages_table_model_->GetRenderProcessHost()) { | 329 hung_pages_table_model_->GetRenderProcessHost()) { |
330 | 330 |
331 base::ProcessHandle process_handle = | 331 base::ProcessHandle process_handle = |
332 hung_pages_table_model_->GetRenderProcessHost()->GetHandle(); | 332 hung_pages_table_model_->GetRenderProcessHost()->GetHandle(); |
333 | 333 |
334 KillRendererProcess(process_handle); | 334 KillRendererProcess(process_handle); |
335 } | 335 } |
336 } | 336 } |
337 | 337 |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 } | 469 } |
470 | 470 |
471 void HideHungRendererDialog(WebContents* contents) { | 471 void HideHungRendererDialog(WebContents* contents) { |
472 if (!logging::DialogsAreSuppressed() && | 472 if (!logging::DialogsAreSuppressed() && |
473 !PlatformHideCustomHungRendererDialog(contents) && | 473 !PlatformHideCustomHungRendererDialog(contents) && |
474 HungRendererDialogView::GetInstance()) | 474 HungRendererDialogView::GetInstance()) |
475 HungRendererDialogView::GetInstance()->EndForWebContents(contents); | 475 HungRendererDialogView::GetInstance()->EndForWebContents(contents); |
476 } | 476 } |
477 | 477 |
478 } // namespace chrome | 478 } // namespace chrome |
OLD | NEW |