ui/views/controls/button/label_button.cc - Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code.

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/controls/button/label_button.cc

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restore [D]CHECKs and loop scoping. Created 7 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:

Index: ui/views/controls/button/label_button.cc

diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc

index 39140ed5def3f561c10d57bf56efcae47c1bdc8e..491e3a504ab6d7d57ff4b189d3dad80b1c0c8098 100644

--- a/ui/views/controls/button/label_button.cc

+++ b/ui/views/controls/button/label_button.cc

@@ -140,7 +140,7 @@ void LabelButton::SetIsDefault(bool is_default) {

void LabelButton::SetStyle(ButtonStyle style) {

// Use the new button style instead of the native button style.

// TODO(msw): Officialy deprecate and remove STYLE_NATIVE_TEXTBUTTON.

- if (DialogDelegate::UseNewStyle() && style == STYLE_NATIVE_TEXTBUTTON)

+ if (style == STYLE_NATIVE_TEXTBUTTON)

style = STYLE_BUTTON;

style_ = style;