Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6877)

Unified Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.cc

Issue 2478863003: Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac (Closed)
Patch Set: initialize pointer to be nullptr Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ed79e648a9e1f9aaa11ad1e0d048289288dfbf5a 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(
@@ -61,7 +63,24 @@ bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
}
views::View* ChooserDialogView::CreateFootnoteView() {
- return chooser_content_view_->CreateFootnoteView();
+ return chooser_content_view_->footnote_link();
+}
+
+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) {
+ // ChooserDialogView always has a parent, so ShouldUseCustomFrame() should
+ // always be true.
+ DCHECK(ShouldUseCustomFrame());
+ return views::DialogDelegate::CreateDialogFrameView(
+ widget, gfx::Insets(views::kPanelVertMargin, views::kPanelHorizMargin,
+ views::kPanelVertMargin, views::kPanelHorizMargin));
}
bool ChooserDialogView::Accept() {

Powered by Google App Engine
This is Rietveld 408576698