Harmony - convert hung renderer dialog.

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/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/platform_util.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/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/layout_utils.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/favicon/content/content_favicon_driver.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/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.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/md_text_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_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
@@ skipping 121 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView
 
 // static
 gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL;
 
 // The dimensions of the hung pages list table view, in pixels.
 static const int kTableViewWidth = 300;
 static const int kTableViewHeight = 100;
 
-// Padding space in pixels between frozen icon to the info label, hung pages
-// list table view and the Kill pages button.
-static const int kCentralColumnPadding =
-    views::kUnrelatedControlLargeHorizontalSpacing;
-
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, public:
 
 // static
 HungRendererDialogView* HungRendererDialogView::Create(
     gfx::NativeWindow context) {
   if (!g_instance_) {
     g_instance_ = new HungRendererDialogView;
     views::DialogDelegate::CreateDialogWidget(g_instance_, context, NULL);
   }
@@ skipping 146 matching lines @@
 base::string16 HungRendererDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   DCHECK_EQ(ui::DIALOG_BUTTON_CANCEL, button);
   return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT);
 }
 
 views::View* HungRendererDialogView::CreateExtraView() {
   DCHECK(!kill_button_);
   kill_button_ = views::MdTextButton::CreateSecondaryUiButton(this,
       l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_END));
+  LayoutDelegate* delegate = LayoutDelegate::Get();
+  // The kill button doesn't look like a normal dialog button pre-harmony.

[Peter Kasting, 2017/02/02 00:32:30]

Oh?  It looks like one in my build.  Say more?  What would applying this min
size unconditionally do?

[Bret, 2017/02/03 01:47:17]

I meant that it's an extra view, off to the left, and Jayson wanted it on the
right, as if it were the cancel button. So I'm trying to preserve the original
look for pre-harmony. I figured it was okay if pre-harmony stuff was a little
weird because it will go away eventually.

+  if (delegate->IsHarmonyMode())
+    kill_button_->SetMinSize(
+        gfx::Size(delegate->GetDialogButtonMinimumWidth(), 0));
   return kill_button_;
 }
 
+bool HungRendererDialogView::GroupExtraViewWithButtons() const {
+  // In harmony the kill button looks like a dialog button, but still doesn't
+  // respond to accelerator keys, so it remains an extra view.

[Peter Kasting, 2017/02/02 00:32:30]

Why doesn't it respond to accelerator keys?  Are we worried about accidentally
killing something?  This behavior sounds questionable.

[Bret, 2017/02/03 01:47:17]

I dunno, that's the only reason I can think of that it's an extra dialog, other
than maybe someone REALLY wanted it to appear on the left. I actually think it
would kinda be weird if you pressed ESC and it killed the page, instead of
waiting. But I don't have a strong opinion.

+  return LayoutDelegate::Get()->IsHarmonyMode();
+}
+
 bool HungRendererDialogView::Cancel() {
   // Start waiting again for responsiveness.
   if (!kill_button_clicked_ &&
       hung_pages_table_model_->GetRenderViewHost()) {
     hung_pages_table_model_->GetRenderViewHost()
         ->GetWidget()
         ->RestartHangMonitorTimeoutIfNecessary();
   }
   return true;
 }
@@ skipping 73 matching lines @@
   hung_pages_table_model_.reset(new HungPagesTableModel(this));
   std::vector<ui::TableColumn> columns;
   columns.push_back(ui::TableColumn());
   hung_pages_table_ = new views::TableView(
       hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true);
   hung_pages_table_->SetGrouper(hung_pages_table_model_.get());
 
   using views::GridLayout;
   using views::ColumnSet;
 
-  GridLayout* layout = GridLayout::CreatePanel(this);
-  SetLayoutManager(layout);
+  GridLayout* layout = layout_utils::CreatePanelLayout(this);
+  LayoutDelegate* delegate = LayoutDelegate::Get();
 
   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, kCentralColumnPadding);
+  column_set->AddPaddingColumn(
+      0, delegate->GetLayoutDistance(
+             LayoutDelegate::LayoutDistanceType::
+                 UNRELATED_CONTROL_LARGE_HORIZONTAL_SPACING));
   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);
   // Add the label with a preferred width of 1, this way it doesn't affect the
   // overall preferred size of the dialog.
   layout->AddView(
       info_label_, 1, 1, GridLayout::FILL, GridLayout::LEADING, 1, 0);
 
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(
+      0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
+                                         RELATED_CONTROL_VERTICAL_SPACING));
 
   layout->StartRow(0, double_column_set_id);
   layout->SkipColumns(1);
   layout->AddView(hung_pages_table_->CreateParentIfNecessary(), 1, 1,
                   views::GridLayout::FILL,
                   views::GridLayout::FILL, kTableViewWidth, kTableViewHeight);
 
   initialized_ = true;
 }
 
 // static
 void HungRendererDialogView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
 }