Attempt 2 at: Adds a trivial views based table implementation (only supports single

chrome/browser/ui/views/hung_renderer_view.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/browser_dialogs.h"
 
+#if defined(OS_WIN) && !defined(USE_AURA)
+#include <windows.h>
+#endif
+
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_vector.h"
+#include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.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/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/group_table_model.h"
 #include "ui/views/controls/table/group_table_view.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"
 #include "ui/views/window/dialog_delegate.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
+#endif
+
 class HungRendererDialogView;
 
 using content::WebContents;
 
 namespace {
 // We only support showing one of these at a time per app.
 HungRendererDialogView* g_instance = NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 276 matching lines @@
 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.
-  HWND frame_hwnd = GetAncestor(contents->GetNativeView(), GA_ROOT);
-  HWND foreground_window = GetForegroundWindow();
-  if (foreground_window != frame_hwnd &&
-      foreground_window != GetWidget()->GetNativeWindow()) {
+  gfx::NativeView frame_view =
+      platform_util::GetTopLevel(contents->GetNativeView());
+  if (!platform_util::IsWindowActive(frame_view) &&
+      !platform_util::IsWindowActive(GetWidget()->GetNativeWindow())) {
     return;
   }
 
   if (!GetWidget()->IsActive()) {
     gfx::Rect bounds = GetDisplayBounds(contents);
     views::Widget* insert_after =
-        views::Widget::GetWidgetForNativeView(frame_hwnd);
+        views::Widget::GetWidgetForNativeView(frame_view);
     GetWidget()->SetBoundsConstrained(bounds);
     if (insert_after)
       GetWidget()->StackAboveWidget(insert_after);
 
     // We only do this if the window isn't active (i.e. hasn't been shown yet,
     // or is currently shown but deactivated for another WebContents). This is
     // because this window is a singleton, and it's possible another active
     // renderer may hang while this one is showing, and we don't want to reset
     // the list of hung pages for a potentially unrelated renderer while this
     // one is showing.
@@ skipping 61 matching lines @@
 
 views::View* HungRendererDialogView::GetContentsView() {
   return this;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, views::ButtonListener implementation:
 
 void HungRendererDialogView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
-  if (sender == kill_button_) {
-    if (hung_pages_table_model_->GetRenderProcessHost()) {
-      // Kill the process.
-      TerminateProcess(
-          hung_pages_table_model_->GetRenderProcessHost()->GetHandle(),
-          content::RESULT_CODE_HUNG);
-    }
+  if (sender == kill_button_ &&
+      hung_pages_table_model_->GetRenderProcessHost()) {
+    // Kill the process.
+    base::KillProcess(
+        hung_pages_table_model_->GetRenderProcessHost()->GetHandle(),
+        content::RESULT_CODE_HUNG, false);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, HungPagesTableModel::Delegate overrides:
 
 void HungRendererDialogView::TabDestroyed() {
   GetWidget()->Close();
 }
 
@@ skipping 18 matching lines @@
       l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER));
   info_label_->SetMultiLine(true);
   info_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   hung_pages_table_model_.reset(new HungPagesTableModel(this));
   std::vector<ui::TableColumn> columns;
   columns.push_back(ui::TableColumn());
   hung_pages_table_ = new views::GroupTableView(
       hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true,
       false, true, false);
-  hung_pages_table_->SetPreferredSize(
-    gfx::Size(kTableViewWidth, kTableViewHeight));
 
   CreateKillButtonView();
 
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int double_column_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(double_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::FIXED, frozen_icon_->width(), 0);
   column_set->AddPaddingColumn(
       0, views::kUnrelatedControlLargeHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, double_column_set_id);
   layout->AddView(frozen_icon_view_, 1, 3);
   layout->AddView(info_label_);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, double_column_set_id);
   layout->SkipColumns(1);
-  layout->AddView(hung_pages_table_);
+  layout->AddView(hung_pages_table_->CreateParentIfNecessary(), 1, 1,
+                  views::GridLayout::FILL,
+                  views::GridLayout::FILL, kTableViewWidth, kTableViewHeight);
 
   initialized_ = true;
 }
 
 void HungRendererDialogView::CreateKillButtonView() {
-  kill_button_ = new views::NativeTextButton(this, UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_END)));
+  kill_button_ = new views::NativeTextButton(this,
+      l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_END));
 
   kill_button_container_ = new View;
 
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(kill_button_container_);
   kill_button_container_->SetLayoutManager(layout);
 
   const int single_column_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
   column_set->AddPaddingColumn(0, frozen_icon_->width() +
       views::kPanelHorizMargin + views::kUnrelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(kill_button_);
 }
 
 gfx::Rect HungRendererDialogView::GetDisplayBounds(
     WebContents* contents) {
+#if defined(USE_AURA)
+  gfx::Rect contents_bounds(contents->GetNativeView()->GetScreenBounds());
+#elif defined(OS_WIN)
   HWND contents_hwnd = contents->GetNativeView();
   RECT contents_bounds_rect;
   GetWindowRect(contents_hwnd, &contents_bounds_rect);
   gfx::Rect contents_bounds(contents_bounds_rect);
+#endif
   gfx::Rect window_bounds = GetWidget()->GetWindowScreenBounds();
 
   int window_x = contents_bounds.x() +
       (contents_bounds.width() - window_bounds.width()) / 2;
   int window_y = contents_bounds.y() + kOverlayContentsOffsetY;
   return gfx::Rect(window_x, window_y, window_bounds.width(),
                    window_bounds.height());
 }
 
 // static
@@ skipping 21 matching lines @@
     g_instance->ShowForWebContents(contents);
   }
 }
 
 void HideNativeHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForWebContents(contents);
 }
 
 }  // namespace browser