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

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

Issue 2478863003: Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac (Closed)
Patch Set: updated ChooserDialogViewTest 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.h
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view.h b/chrome/browser/ui/views/extensions/chooser_dialog_view.h
index fe8ebfd12390566dfacfedb338b79da0f39bbe14..710116065bebbd28f623c948622eb12e310db3f0 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view.h
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view.h
@@ -11,6 +11,10 @@
#include "ui/views/controls/table/table_view_observer.h"
#include "ui/views/window/dialog_delegate.h"
+namespace views {
+class StyledLabel;
+}
+
class ChooserContentView;
class ChooserController;
@@ -32,6 +36,9 @@ class ChooserDialogView : public views::DialogDelegateView,
base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
bool IsDialogButtonEnabled(ui::DialogButton button) const override;
views::View* CreateFootnoteView() override;
+ views::ClientView* CreateClientView(views::Widget* widget) override;
+ views::NonClientFrameView* CreateNonClientFrameView(
+ views::Widget* widget) override;
bool Accept() override;
bool Cancel() override;
bool Close() override;
@@ -47,6 +54,9 @@ class ChooserDialogView : public views::DialogDelegateView,
ChooserContentView* chooser_content_view_for_test() const;
private:
+ // |footnote_link_| will transfer its ownership of the pointer to its
+ // caller when CreateFootnoteView() is called.
+ std::unique_ptr<views::StyledLabel> footnote_link_;
ChooserContentView* chooser_content_view_;
DISALLOW_COPY_AND_ASSIGN(ChooserDialogView);

Powered by Google App Engine
This is Rietveld 408576698