Add support for invoking the Windows 8 metro style hung renderer dialog box. The dialog box

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"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
@@ skipping 21 matching lines @@
 #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(USE_AURA)
 #include "ui/aura/window.h"
 #endif
 
-#if defined(OS_WIN)
-#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
-#endif
+// 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 111 matching lines @@
 // warning window.
 static const int kOverlayContentsOffsetY = 50;
 
 // The dimensions of the hung pages list table view, in pixels.
 static const int kTableViewWidth = 300;
 static const int kTableViewHeight = 100;
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, public:
 
-#if !defined(OS_WIN)
-
 // static
 HungRendererDialogView* HungRendererDialogView::Create() {
   if (!g_instance_) {
     g_instance_ = new HungRendererDialogView;
     views::Widget::CreateWindow(g_instance_);
   }
   return g_instance_;
 }
-#endif  // defined(OS_WIN)
 
 // static
 HungRendererDialogView* HungRendererDialogView::GetInstance() {
   return g_instance_;
 }
 
+// static

[sky, 2012/07/24 22:57:03]

Make position of these two match header.

[ananta, 2012/07/24 23:16:37]

Moved these declaration and impl of these functions after the GetInstance
function in the class.

+bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
+  gfx::NativeView frame_view =
+      platform_util::GetTopLevel(contents->GetNativeView());
+  return platform_util::IsWindowActive(frame_view);
+}
+
+#if !defined(OS_WIN)
+// static
+void HungRendererDialogView::KillRendererProcess(
+    base::ProcessHandle process_handle) {
+  base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
+}
+#endif  // OS_WIN
+
 HungRendererDialogView::HungRendererDialogView()
     : hung_pages_table_(NULL),
       kill_button_(NULL),
       kill_button_container_(NULL),
       initialized_(false) {
   InitClass();
 }
 
 HungRendererDialogView::~HungRendererDialogView() {
   hung_pages_table_->SetModel(NULL);
 }
 
 void HungRendererDialogView::ShowForWebContents(WebContents* contents) {
   DCHECK(contents && GetWidget());
 
   // Don't show the warning unless the foreground window is the frame, or this
   // window (but still invisible). If the user has another window or
   // application selected, activating ourselves is rude.
-  if (!IsFrameActive(contents))
+  if (!IsFrameActive(contents) &&
+      !platform_util::IsWindowActive(GetWidget()->GetNativeWindow()))
     return;
 
   if (!GetWidget()->IsActive()) {
     gfx::Rect bounds = GetDisplayBounds(contents);
 
     gfx::NativeView frame_view =
         platform_util::GetTopLevel(contents->GetNativeView());
 
     views::Widget* insert_after =
         views::Widget::GetWidgetForNativeView(frame_view);
@@ skipping 77 matching lines @@
 // HungRendererDialogView, views::ButtonListener implementation:
 
 void HungRendererDialogView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   if (sender == kill_button_ &&
       hung_pages_table_model_->GetRenderProcessHost()) {
 
     base::ProcessHandle process_handle =
         hung_pages_table_model_->GetRenderProcessHost()->GetHandle();
 
-#if defined(OS_WIN)
-    // Try to generate a crash report for the hung process.
-    CrashDumpAndTerminateHungChildProcess(process_handle);
-#else
-    // Kill the process.
-    base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
-#endif
+    KillRendererProcess(process_handle);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, HungPagesTableModel::Delegate overrides:
 
 void HungRendererDialogView::TabDestroyed() {
   GetWidget()->Close();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, views::View overrides:
 
 void HungRendererDialogView::ViewHierarchyChanged(bool is_add,
                                                   views::View* parent,
                                                   views::View* child) {
   if (!initialized_ && is_add && child == this && GetWidget())
     Init();
 }
 
-bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
-  gfx::NativeView frame_view =
-      platform_util::GetTopLevel(contents->GetNativeView());
-  if (!platform_util::IsWindowActive(frame_view) &&
-      !platform_util::IsWindowActive(GetWidget()->GetNativeWindow())) {
-    return false;
-  }
-  return true;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, private:
 
 void HungRendererDialogView::Init() {
   views::ImageView* frozen_icon_view = new views::ImageView;
   frozen_icon_view->SetImage(frozen_icon_);
 
   views::Label* info_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER));
   info_label->SetMultiLine(true);
@@ skipping 89 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()) {
+  if (!logging::DialogsAreSuppressed() &&
+      !PlatformShowCustomHungRendererDialog(contents)) {
     HungRendererDialogView* view = HungRendererDialogView::Create();
     view->ShowForWebContents(contents);
   }
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() &&
+      !PlatformHideCustomHungRendererDialog(contents) &&
       HungRendererDialogView::GetInstance())
     HungRendererDialogView::GetInstance()->EndForWebContents(contents);
 }
 
 }  // namespace chrome