Harmony - convert hung renderer dialog.

chrome/browser/ui/views/chrome_views_delegate.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/chrome_views_delegate.h"
 
 #include <memory>
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display.h"
@@ skipping 506 matching lines @@
   return content::BrowserThread::GetBlockingPool();
 }
 
 gfx::Insets ChromeViewsDelegate::GetDialogButtonInsets() {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial())
     return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit);
   return ViewsDelegate::GetDialogButtonInsets();
 }
 
 int ChromeViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return HarmonyLayoutDelegate::kHarmonyLayoutUnit / 2;
-  return ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing();
+  return LayoutDelegate::Get()->GetLayoutDistance(
+      LayoutDelegate::LayoutDistanceType::RELATED_BUTTON_HORIZONTAL_SPACING);

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

I think these two functions' changes should be landed already as of last night.

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

Done, all merged.

 }
 
 int ChromeViewsDelegate::GetDialogRelatedControlVerticalSpacing() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return HarmonyLayoutDelegate::kHarmonyLayoutUnit / 2;
-  return ViewsDelegate::GetDialogRelatedControlVerticalSpacing();
+  return LayoutDelegate::Get()->GetLayoutDistance(
+      LayoutDelegate::LayoutDistanceType::RELATED_CONTROL_VERTICAL_SPACING);
+}
+
+int ChromeViewsDelegate::GetDialogButtonMinimumWidth() {
+  return LayoutDelegate::Get()->GetDialogButtonMinimumWidth();
 }
 
 gfx::Insets ChromeViewsDelegate::GetDialogFrameViewInsets() {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial())
     // Titles are inset at the top and sides, but not at the bottom.
     return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit,
                        HarmonyLayoutDelegate::kHarmonyLayoutUnit, 0,
                        HarmonyLayoutDelegate::kHarmonyLayoutUnit);
   return ViewsDelegate::GetDialogFrameViewInsets();
 }
 
 gfx::Insets ChromeViewsDelegate::GetBubbleDialogMargins() {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial())
     return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit);
   return ViewsDelegate::GetBubbleDialogMargins();
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif