Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac

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 "chrome/browser/chooser_controller/chooser_controller.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
 #include "chrome/browser/ui/views/chooser_content_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/controls/link.h"
 #include "ui/views/controls/styled_label.h"
+#include "ui/views/layout/layout_constants.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);
-  chooser_content_view_ =
-      new ChooserContentView(this, std::move(chooser_controller));
+  footnote_link_.reset(new views::StyledLabel(base::string16(), nullptr));

[sky, 2016/11/09 17:55:47]

Use MakeUnique (see threads on chromium-dev for reason).

[juncai, 2016/11/09 20:25:02]

Done.

+  chooser_content_view_ = new ChooserContentView(
+      this, std::move(chooser_controller), footnote_link_.get());
 }
 
 ChooserDialogView::~ChooserDialogView() {}
 
 base::string16 ChooserDialogView::GetWindowTitle() const {
   return 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 chooser_content_view_->GetDialogButtonLabel(button);
 }
 
 bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return chooser_content_view_->IsDialogButtonEnabled(button);
 }
 
 views::View* ChooserDialogView::CreateFootnoteView() {
-  return chooser_content_view_->CreateFootnoteView();
+  DCHECK(footnote_link_);
+  return footnote_link_.release();
+}
+
+views::ClientView* ChooserDialogView::CreateClientView(views::Widget* widget) {
+  views::DialogClientView* client =
+      new views::DialogClientView(widget, GetContentsView());
+  client->set_button_row_insets(gfx::Insets());
+  return client;
+}
+
+views::NonClientFrameView* ChooserDialogView::CreateNonClientFrameView(
+    views::Widget* widget) {
+  DCHECK(ShouldUseCustomFrame());

[sky, 2016/11/09 17:55:47]

Please document why there is the DCHECK. I'm thinking something like:

ChooserDialogView always has a parent, so ShouldUseCustomFrame() should always
be true.

[juncai, 2016/11/09 20:25:02]

Done.

+  return views::DialogDelegate::CreateDialogFrameView(
+      widget, gfx::Insets(views::kPanelVertMargin, views::kPanelHorizMargin,
+                          views::kPanelVertMargin, views::kPanelHorizMargin));
 }
 
 bool ChooserDialogView::Accept() {
   chooser_content_view_->Accept();
   return true;
 }
 
 bool ChooserDialogView::Cancel() {
   chooser_content_view_->Cancel();
   return true;
@@ skipping 29 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(chooser_controller);
 
   web_modal::WebContentsModalDialogManager* manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
   if (manager) {
     constrained_window::ShowWebModalDialogViews(
         new ChooserDialogView(std::move(chooser_controller)), web_contents_);
   }
 }