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

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

Index: chrome/browser/ui/views/extensions/chooser_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view.cc b/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
index da13e010d7215e23d6e69636f4ea58295043d320..fed7ed6a0b7ade1712e254cbd911580c05f074ab 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view.cc
@@ -11,8 +11,10 @@
 #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(
@@ -33,8 +35,9 @@ ChooserDialogView::ChooserDialogView(
   // ------------------------------------
 
   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() {}
@@ -61,7 +64,23 @@ bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
 }
 
 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() {