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 |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/memory/scoped_vector.h" | 12 #include "base/memory/scoped_vector.h" |
13 #include "base/process_util.h" | |
14 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/browser/favicon/favicon_tab_helper.h" | 14 #include "chrome/browser/favicon/favicon_tab_helper.h" |
16 #include "chrome/browser/platform_util.h" | 15 #include "chrome/browser/platform_util.h" |
17 #include "chrome/browser/ui/browser_dialogs.h" | 16 #include "chrome/browser/ui/browser_dialogs.h" |
18 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" | 17 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
19 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" |
20 #include "chrome/common/chrome_constants.h" | 19 #include "chrome/common/chrome_constants.h" |
21 #include "chrome/common/logging_chrome.h" | 20 #include "chrome/common/logging_chrome.h" |
22 #include "content/public/browser/render_process_host.h" | 21 #include "content/public/browser/render_process_host.h" |
23 #include "content/public/browser/render_view_host.h" | 22 #include "content/public/browser/render_view_host.h" |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 } | 449 } |
451 | 450 |
452 void HideHungRendererDialog(WebContents* contents) { | 451 void HideHungRendererDialog(WebContents* contents) { |
453 if (!logging::DialogsAreSuppressed() && | 452 if (!logging::DialogsAreSuppressed() && |
454 !PlatformHideCustomHungRendererDialog(contents) && | 453 !PlatformHideCustomHungRendererDialog(contents) && |
455 HungRendererDialogView::GetInstance()) | 454 HungRendererDialogView::GetInstance()) |
456 HungRendererDialogView::GetInstance()->EndForWebContents(contents); | 455 HungRendererDialogView::GetInstance()->EndForWebContents(contents); |
457 } | 456 } |
458 | 457 |
459 } // namespace chrome | 458 } // namespace chrome |
OLD | NEW |