ui/views/window/dialog_client_view.cc - Issue 1216673005: views::LabelButton should not call virtual methods from its constructor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/window/dialog_client_view.cc

Issue 1216673005: views::LabelButton should not call virtual methods from its constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150703-Views-ButtonBorderRefactor

Patch Set: selfnits Created 5 years, 5 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

« ui/views/controls/button/label_button.h ('K') | « ui/views/touchui/touch_selection_menu_runner_views.cc ('k') | ui/views/window/dialog_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/window/dialog_client_view.cc

diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc

index 8903650d45038bde4601fb5460873bc486ae79c5..d0b9fe39882218300eef88a7409b0a8766ce94ad 100644

--- a/ui/views/window/dialog_client_view.cc

+++ b/ui/views/window/dialog_client_view.cc

@@ -390,11 +390,11 @@ LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {

if (GetDialogDelegate()->UseNewStyleForThisDialog() &&

GetDialogDelegate()->GetDefaultDialogButton() == type &&

GetDialogDelegate()->ShouldDefaultButtonBeBlue()) {

- button = new BlueButton(this, title);

+ button = new BlueButton(this);

} else {

- button = new LabelButton(this, title);

- button->SetStyle(Button::STYLE_BUTTON);

+ button = new LabelButton(this);

}

+ button->InitAsButton(title);

button->SetFocusable(true);

const int kDialogMinButtonWidth = 75;