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..5390708d044346a43d0469f258f6822a3875703d 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(
@@ -64,6 +66,23 @@ views::View* ChooserDialogView::CreateFootnoteView() {
   return chooser_content_view_->CreateFootnoteView();
 }
 
+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) {
+  if (ShouldUseCustomFrame()) {

[sky, 2016/11/07 16:13:06]

How does this dialog look if !ShouldUseCustomFrame? Can you attach a screenshot?

[juncai, 2016/11/07 21:05:45]

I tried it, and the chooser crashes the browser. Since if !ShouldUseCustomFrame,
it calls: WidgetDelegate::CreateNonClientFrameView()
and it returns nullptr:
https://cs.chromium.org/chromium/src/ui/views/widget/widget_delegate.cc?q=Wid...

I guess I need to remove this if statement and just return
views::DialogDelegate::CreateDialogFrameView().

[sky, 2016/11/07 22:01:04]

Can you attach a screenshot for the !ShouldUseCustomFrame case?

[juncai, 2016/11/07 23:39:46]

Changed
return WidgetDelegate::CreateNonClientFrameView(widget);
to
return DialogDelegate::CreateNonClientFrameView(widget);
https://cs.chromium.org/chromium/src/ui/views/window/dialog_delegate.cc?sq=pa...
I uploaded a screenshot on the issue page for the !ShouldUseCustomFrame case.

+    return views::DialogDelegate::CreateDialogFrameView(
+        widget, gfx::Insets(views::kPanelVertMargin, views::kPanelHorizMargin,
+                            views::kPanelVertMargin, views::kPanelHorizMargin));
+  }
+  return WidgetDelegate::CreateNonClientFrameView(widget);
+}
+
 bool ChooserDialogView::Accept() {
   chooser_content_view_->Accept();
   return true;