harmony: convert device chooser

chrome/browser/ui/views/extensions/chooser_dialog_view.cc

 // Copyright 2016 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/extensions/chooser_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
 #include "chrome/browser/extensions/device_permissions_dialog_controller.h"
 #include "chrome/browser/ui/views/device_chooser_content_view.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/sized_dialog_client_view.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/views/background.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
-#include "ui/views/layout/layout_constants.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/dialog_client_view.h"
 
 ChooserDialogView::ChooserDialogView(
     std::unique_ptr<ChooserController> chooser_controller) {
   // ------------------------------------
   // | Chooser dialog title             |
   // | -------------------------------- |
   // | | option 0                     | |
   // | | option 1                     | |
   // | | option 2                     | |
@@ skipping 32 matching lines @@
 
 bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return device_chooser_content_view_->IsDialogButtonEnabled(button);
 }
 
 views::View* ChooserDialogView::CreateFootnoteView() {
   return device_chooser_content_view_->footnote_link();
 }
 
 views::ClientView* ChooserDialogView::CreateClientView(views::Widget* widget) {
+  const int kMinWidth = 402;

[Peter Kasting, 2017/02/07 00:17:15]

Nit: constexpr

[Elly Fong-Jones, 2017/02/07 14:02:10]

Done.

+  const int kMinHeight = 320;
+  int min_width = LayoutDelegate::Get()->GetDialogPreferredWidth(
+      LayoutDelegate::DialogWidth::MEDIUM);
+  if (!min_width)
+    min_width = kMinWidth;
+  gfx::Size minimum_size(min_width, kMinHeight);
   views::DialogClientView* client =
-      new views::DialogClientView(widget, GetContentsView());
-  client->set_button_row_insets(gfx::Insets());
+      new SizedDialogClientView(widget, GetContentsView(), minimum_size);
+  LayoutDelegate* delegate = LayoutDelegate::Get();
+  client->set_button_row_insets(gfx::Insets(
+      delegate->GetMetric(
+          LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING),
+      0, 0, 0));
   return client;
 }
 
 views::NonClientFrameView* ChooserDialogView::CreateNonClientFrameView(
     views::Widget* widget) {
   // ChooserDialogView always has a parent, so ShouldUseCustomFrame() should
   // always be true.
   DCHECK(ShouldUseCustomFrame());
+  LayoutDelegate* delegate = LayoutDelegate::Get();
   return views::DialogDelegate::CreateDialogFrameView(
-      widget, gfx::Insets(views::kPanelVertMargin, views::kPanelHorizMargin,
-                          views::kPanelVertMargin, views::kPanelHorizMargin));
+      widget,
+      gfx::Insets(
+          delegate->GetMetric(LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),

[Peter Kasting, 2017/02/07 00:17:15]

Nit: Factor to a temp

[Elly Fong-Jones, 2017/02/07 14:02:10]

switched to the 1-arg form of gfx::Insets() instead

+          delegate->GetMetric(LayoutDelegate::Metric::PANEL_CONTENT_MARGIN)));
 }
 
 bool ChooserDialogView::Accept() {
   device_chooser_content_view_->Accept();
   return true;
 }
 
 bool ChooserDialogView::Cancel() {
   device_chooser_content_view_->Cancel();
   return true;
@@ skipping 41 matching lines @@
 void ChromeDevicePermissionsPrompt::ShowDialogViews() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   std::unique_ptr<ChooserController> chooser_controller(
       new DevicePermissionsDialogController(web_contents()->GetMainFrame(),
                                             prompt()));
 
   constrained_window::ShowWebModalDialogViews(
       new ChooserDialogView(std::move(chooser_controller)), web_contents());
 }