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                     | |
@@ skipping 31 matching lines @@
 }
 
 bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return chooser_content_view_->IsDialogButtonEnabled(button);
 }
 
 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;
 }
 
 bool ChooserDialogView::Cancel() {
   chooser_content_view_->Cancel();
   return true;
 }
 
@@ skipping 27 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_);
   }
 }