Add views::Button style enum for LabelButton [native] styling, etc.

Add views::Button style enum for LabelButton [native] styling, etc.

Add Button::ButtonStyle enum for existing [native] LabelButton styles.
Add ButtonStyle member and accessors (or ctor arg) to LabelButton[Border].
These replace LabelButton[Border] native_style flag, will support more later. 

Add LabelButton::kViewClassName, use for manual RTTI in a DCHECK.
Move CustomButton::ButtonState to Button; update some usage.
Other minor cleanup and refactoring.

This should facilitate implementation and use of other LabelButton styles/types:
TODO(followup): Add toggled state for checkboxes, radio buttons, etc.
TODO(followup): Add Styles: "Chrome Style", Checkbox, Radio, Menu, ComboBox, etc.
(each style probably just needs to set some IDRs/colors/insets/etc. on LabelButton)

BUG=155363
TEST=No observable Views Button changes.
R=sky@chromium.org 
NOTRY=true
(added notry for weird concatenated linux_rel step "browser_testsnet_unittests")

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183797

[msw, 2013-02-20 16:53:33]

Hey Scott, please take a look; thanks!

[tfarina, 2013-02-20 17:01:06]

Mike, can you explain in simple terms in the commit message why you are doing
this, why you need to do this?

As far as I can see you just say what you did.

https://codereview.chromium.org/12330002/diff/6001/ui/views/controls/button/b...
File ui/views/controls/button/button.h (right):

https://codereview.chromium.org/12330002/diff/6001/ui/views/controls/button/b...
ui/views/controls/button/button.h:33: enum ButtonState {
Why did you move it here?

[msw, 2013-02-20 17:17:22]

I added some reasoning and TODOs to the CL description.

https://codereview.chromium.org/12330002/diff/6001/ui/views/controls/button/b...
File ui/views/controls/button/button.h (right):

https://codereview.chromium.org/12330002/diff/6001/ui/views/controls/button/b...
ui/views/controls/button/button.h:33: enum ButtonState {
On 2013/02/20 17:01:06, tfarina wrote:
> Why did you move it here?

Because button state is a fairly essential and straightforward interface value.
Eventually, additional CustomButton stuff should be merged into Button.
That said, I'm willing to leave it in CustomButton if that's desired.

[sky, 2013-02-20 18:16:49]

LGTM

[commit-bot: I haz the power, 2013-02-21 01:11:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msw@chromium.org/12330002/6001

[commit-bot: I haz the power, 2013-02-21 01:11:41]

Failed to apply patch for ui/views/controls/button/label_button.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/views/controls/button/label_button.cc
  Hunk #2 FAILED at 40.
  Hunk #4 succeeded at 120 with fuzz 1.
  Hunk #9 succeeded at 294 with fuzz 2.
  1 out of 9 hunks FAILED -- saving rejects to file
ui/views/controls/button/label_button.cc.rej

Patch:       ui/views/controls/button/label_button.cc
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
2d9ff0c6076ee501f24dc70529d65ea70249e59f..eff2d9361cc5a83beb16351adc6fdbe4012b1e04
100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -29,6 +29,9 @@ const int kHoverAnimationDurationMs = 170;
 
 namespace views {
 
+// static
+const char LabelButton::kViewClassName[] = "views/LabelButton";
+
 LabelButton::LabelButton(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       image_(new ImageView()),
@@ -37,10 +40,7 @@ LabelButton::LabelButton(ButtonListener* listener, const
string16& text)
       button_state_colors_(),
       explicitly_set_colors_(),
       default_button_(false),
-      native_theme_(false) {
-  set_border(new LabelButtonBorder());
-  // Inset the button focus rect from the actual border; roughly match Windows.
-  set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
+      style_(STYLE_TEXTBUTTON) {
   SetAnimationDuration(kHoverAnimationDurationMs);
 
   AddChildView(image_);
@@ -50,8 +50,8 @@ LabelButton::LabelButton(ButtonListener* listener, const
string16& text)
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
-  // Initialize the colors, border, and layout for a Views-themed button.
-  SetNativeTheme(false);
+  // Initialize the colors, border, and layout.
+  SetStyle(style_);
 }
 
 LabelButton::~LabelButton() {}
@@ -117,11 +117,11 @@ void LabelButton::SetDefaultButton(bool default_button) {
   default_button_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 }
 
-void LabelButton::SetNativeTheme(bool native_theme) {
-  native_theme_ = native_theme;
-  LabelButtonBorder* border = new LabelButtonBorder();
-  border->set_native_theme(native_theme);
-  set_border(border);
+void LabelButton::SetStyle(ButtonStyle style) {
+  style_ = style;
+  set_border(new LabelButtonBorder(style));
+  // Inset the button focus rect from the actual border; roughly match Windows.
+  set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
@@ -155,6 +155,10 @@ gfx::Size LabelButton::GetPreferredSize() {
   return size;
 }
 
+std::string LabelButton::GetClassName() const {
+  return kViewClassName;
+}
+
 void LabelButton::ResetColorsFromNativeTheme() {
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor colors[STATE_COUNT] = {
@@ -165,7 +169,8 @@ void LabelButton::ResetColorsFromNativeTheme() {
   };
 #if defined(OS_WIN)
   // Native Windows buttons do not change color on hover or when pressed.
-  if (native_theme_ && theme == ui::NativeThemeWin::instance())
+  if (style() == STYLE_NATIVE_TEXTBUTTON &&
+      theme == ui::NativeThemeWin::instance())
     colors[STATE_HOVERED] = colors[STATE_PRESSED] = colors[STATE_NORMAL];
 #endif
   for (size_t state = STATE_NORMAL; state < STATE_COUNT; ++state) {
@@ -229,10 +234,6 @@ void LabelButton::Layout() {
   label_->SetBoundsRect(gfx::Rect(label_origin, label_size));
 }
 
-std::string LabelButton::GetClassName() const {
-  return "views/LabelButton";
-}
-
 void LabelButton::ChildPreferredSizeChanged(View* child) {
   PreferredSizeChanged();
 }
@@ -264,7 +265,8 @@ ui::NativeTheme::State LabelButton::GetThemeState(
 
 const ui::Animation* LabelButton::GetThemeAnimation() const {
 #if defined(OS_WIN)
-  if (native_theme_ && GetNativeTheme() == ui::NativeThemeWin::instance()) {
+  if (style() == STYLE_NATIVE_TEXTBUTTON &&
+      GetNativeTheme() == ui::NativeThemeWin::instance()) {
     return ui::NativeThemeWin::instance()->IsThemingActive() ?
         hover_animation_.get() : NULL;
   }
@@ -289,7 +291,7 @@ void
LabelButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   params->button.indeterminate = false;
   params->button.is_default = default_button();
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
-  params->button.has_border = native_theme();
+  params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);

[commit-bot: I haz the power, 2013-02-21 04:16:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msw@chromium.org/12330002/6002

[commit-bot: I haz the power, 2013-02-21 07:53:29]

Retried try job too often on android_clang_dbg for step(s) build
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...

[commit-bot: I haz the power, 2013-02-21 07:54:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msw@chromium.org/12330002/6002

[commit-bot: I haz the power, 2013-02-21 09:12:15]

Retried try job too often on linux_rel for step(s) browser_testsnet_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2013-02-21 12:05:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msw@chromium.org/12330002/6002

[commit-bot: I haz the power, 2013-02-21 12:56:00]

Retried try job too often on linux_rel for step(s) browser_testsnet_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2013-02-21 13:43:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msw@chromium.org/12330002/6002

[commit-bot: I haz the power, 2013-02-21 13:43:50]

Change committed as 183797