Make LabelButton STYLE_NATIVE_TEXTBUTTON focusable; etc.

ui/views/controls/button/label_button.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 101 matching lines @@
 void LabelButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   is_default_ = is_default;
   ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE);
   is_default_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 }
 
 void LabelButton::SetStyle(ButtonStyle style) {
   style_ = style;
   set_border(new LabelButtonBorder(style));

[tfarina, 2013/04/04 22:58:46]

things are getting messier here, inconsistent use of |style| vs |style_|, can we
use one or the other through out in this function?

[msw, 2013/04/04 23:34:45]

Done; I changed the one use of |style_| in this function (besides setting its
value) to |style|.

   // Inset the button focus rect from the actual border; roughly match Windows.
   if (style == STYLE_TEXTBUTTON || style == STYLE_NATIVE_TEXTBUTTON)

[tfarina, 2013/04/04 22:58:46]

should we start refactoring here, and have a single if for STYLE_TEXTBUTTON and
another for STYLE_NATIVE_TEXTBUTTON?

[msw, 2013/04/04 23:34:45]

I think it's okay for now, but might switch it up later.

     set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   if (style == STYLE_BUTTON || style_ == STYLE_NATIVE_TEXTBUTTON)
     label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  if (style == STYLE_NATIVE_TEXTBUTTON)
+    set_focusable(true);
   if (style == STYLE_BUTTON) {
     set_min_size(gfx::Size(70, 31));
     const SkColor color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_WindowBackground);
     label_->SetShadowColors(color, color);
     label_->SetShadowOffset(0, 1);
   }
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
@@ skipping 167 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views