diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 02:38:20 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 02:38:20 +0000 |
| commit | 6d114939fea7db115cb08d54cab70e870de859f1 (patch) | |
| tree | 2a9e5c594d25750c83a5ceabdc7b40e8e90d8426 /ui | |
| parent | f9cd748bf5dd156b2ca9c2132fb483bd1c41b349 (diff) | |
| download | chromium_src-6d114939fea7db115cb08d54cab70e870de859f1.zip chromium_src-6d114939fea7db115cb08d54cab70e870de859f1.tar.gz chromium_src-6d114939fea7db115cb08d54cab70e870de859f1.tar.bz2 | |
Restrict the new button style to the new dialog style flag.
BUG=155363,166075
TEST=The new button style is only used with --enable-new-dialog-style.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14118013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/button/label_button.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index bbad84c..7587156 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc @@ -11,6 +11,7 @@ #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/focus_border.h" +#include "ui/views/window/dialog_delegate.h" #if defined(OS_WIN) #include "ui/gfx/color_utils.h" @@ -132,7 +133,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 (style == STYLE_NATIVE_TEXTBUTTON) + if (DialogDelegate::UseNewStyle() && style == STYLE_NATIVE_TEXTBUTTON) style = STYLE_BUTTON; style_ = style; |