Removes win8_util

chrome/browser/ui/views/hung_renderer_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/hung_renderer_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 #if defined(OS_WIN)
+#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#endif
-
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 using content::WebContents;
 
-// These functions allow certain chrome platforms to override the default hung
-// renderer dialog. For e.g. Chrome on Windows 8 metro
-bool PlatformShowCustomHungRendererDialog(WebContents* contents);
-bool PlatformHideCustomHungRendererDialog(WebContents* contents);
-
-#if !defined(OS_WIN)
-bool PlatformShowCustomHungRendererDialog(WebContents* contents) {
-  return false;
-}
-
-bool PlatformHideCustomHungRendererDialog(WebContents* contents) {
-  return false;
-}
-#endif  // OS_WIN
-
 HungRendererDialogView* HungRendererDialogView::g_instance_ = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungPagesTableModel, public:
 
 HungPagesTableModel::HungPagesTableModel(Delegate* delegate)
     : observer_(NULL),
       delegate_(delegate) {
 }
 
@@ skipping 129 matching lines @@
   return g_instance_;
 }
 
 // static
 bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
   gfx::NativeView frame_view =
       platform_util::GetTopLevel(contents->GetView()->GetNativeView());
   return platform_util::IsWindowActive(frame_view);
 }
 
-#if !defined(OS_WIN)
 // static
 void HungRendererDialogView::KillRendererProcess(
     base::ProcessHandle process_handle) {
+#if defined(OS_WIN)
+  // Try to generate a crash report for the hung process.
+  CrashDumpAndTerminateHungChildProcess(process_handle);
+#else
   base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
+#endif
 }
-#endif  // OS_WIN
 
 
 HungRendererDialogView::HungRendererDialogView()
     : hung_pages_table_(NULL),
       kill_button_(NULL),
       initialized_(false) {
   InitClass();
 }
 
 HungRendererDialogView::~HungRendererDialogView() {
@@ skipping 206 matching lines @@
   if (!initialized) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
 }
 
 namespace chrome {
 
 void ShowHungRendererDialog(WebContents* contents) {
-  if (!logging::DialogsAreSuppressed() &&
-      !PlatformShowCustomHungRendererDialog(contents)) {
-    gfx::NativeView toplevel_view =
-        platform_util::GetTopLevel(contents->GetView()->GetNativeView());
-#if defined(USE_AURA)
-    // Don't show the dialog if there is no root window for the renderer,
-    // because it's invisible to the user (happens when the renderer is for
-    // prerendering for example).
-    if (!toplevel_view->GetRootWindow())
-      return;
-#endif
-    HungRendererDialogView* view = HungRendererDialogView::Create(
-        toplevel_view);
-    view->ShowForWebContents(contents);
-  }
+  if (logging::DialogsAreSuppressed())
+    return;
+
+  gfx::NativeView toplevel_view =
+      platform_util::GetTopLevel(contents->GetView()->GetNativeView());
+  // Don't show the dialog if there is no root window for the renderer, because
+  // it's invisible to the user (happens when the renderer is for prerendering
+  // for example).
+  if (!toplevel_view->GetRootWindow())
+    return;
+  HungRendererDialogView* view = HungRendererDialogView::Create(toplevel_view);
+  view->ShowForWebContents(contents);
 }
 
 void HideHungRendererDialog(WebContents* contents) {
-  if (!logging::DialogsAreSuppressed() &&
-      !PlatformHideCustomHungRendererDialog(contents) &&
-      HungRendererDialogView::GetInstance())
+  if (!logging::DialogsAreSuppressed() && HungRendererDialogView::GetInstance())
     HungRendererDialogView::GetInstance()->EndForWebContents(contents);
 }
 
 }  // namespace chrome