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

Unified Diff: chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc

Issue 2907983002: Allow dialogs to use a custom View as their title. (Closed)
Patch Set: merge Created 3 years, 6 months 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/permission_bubble/permission_prompt_impl.cc
diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
index 37470e6fc4eee68dcc66fd23528d462423857677..b20417acc62a580f26456e5b4f40d2a460216e4d 100644
--- a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
+++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
@@ -59,8 +59,8 @@ class PermissionsBubbleDialogDelegateView
// BubbleDialogDelegateView:
bool ShouldShowCloseButton() const override;
- const gfx::FontList& GetTitleFontList() const override;
base::string16 GetWindowTitle() const override;
+ void AddedToWidget() override;
void OnWidgetDestroying(views::Widget* widget) override;
void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
bool Cancel() override;
@@ -151,17 +151,19 @@ bool PermissionsBubbleDialogDelegateView::ShouldShowCloseButton() const {
return true;
}
-const gfx::FontList& PermissionsBubbleDialogDelegateView::GetTitleFontList()
- const {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- return rb.GetFontList(ui::ResourceBundle::BaseFont);
-}
-
base::string16 PermissionsBubbleDialogDelegateView::GetWindowTitle() const {
return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,
display_origin_);
}
+void PermissionsBubbleDialogDelegateView::AddedToWidget() {
+ std::unique_ptr<views::Label> title =
+ views::BubbleFrameView::CreateDefaultTitleLabel(GetWindowTitle());
+ title->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
+ ui::ResourceBundle::BaseFont));
+ GetBubbleFrameView()->SetTitleView(std::move(title));
+}
+
void PermissionsBubbleDialogDelegateView::SizeToContents() {
BubbleDialogDelegateView::SizeToContents();
}
« no previous file with comments | « chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc ('k') | ui/views/bubble/bubble_dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698