Refactor ChooserDialogView to use borders instead of content margins.

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/browser_dialogs.h"
 #include "chrome/browser/ui/views/device_chooser_content_view.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.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/border.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.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                     | |
   // | |                              | |
   // | |                              | |
   // | |                              | |
   // | -------------------------------- |
   // |           [ Connect ] [ Cancel ] |
   // |----------------------------------|
   // | Get help                         |
   // ------------------------------------
 
   DCHECK(chooser_controller);
   device_chooser_content_view_ =
       new DeviceChooserContentView(this, std::move(chooser_controller));
+  device_chooser_content_view_->SetBorder(
+      views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric(
+          views::INSETS_DIALOG_CONTENTS)));
   chrome::RecordDialogCreation(chrome::DialogIdentifier::CHOOSER);
 }
 
 ChooserDialogView::~ChooserDialogView() {}
 
 base::string16 ChooserDialogView::GetWindowTitle() const {
   return device_chooser_content_view_->GetWindowTitle();
 }
 
 bool ChooserDialogView::ShouldShowCloseButton() const {
   return false;
 }
 
 ui::ModalType ChooserDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
 base::string16 ChooserDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return device_chooser_content_view_->GetDialogButtonLabel(button);
 }
 
 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) {
-  views::DialogClientView* client =
-      new views::DialogClientView(widget, GetContentsView());
-  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
-  client->SetButtonRowInsets(gfx::Insets(
-      provider->GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL),
-      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());
-  return views::DialogDelegate::CreateDialogFrameView(
-      widget, ChromeLayoutProvider::Get()->GetInsetsMetric(
-                  views::INSETS_BUBBLE_CONTENTS));
+  views::View* footnote_link = device_chooser_content_view_->footnote_link();
+  if (footnote_link) {
+    footnote_link->SetBorder(
+        views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric(
+            views::INSETS_DIALOG_CONTENTS)));
+  }
+  return footnote_link;
 }
 
 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());
 }