Make infobar controls focusable by default.

views/controls/button/text_button.cc

 // Copyright (c) 2011 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 "views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 16 matching lines @@
 // The min size in DLUs comes from
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch14e.asp
 static const int kMinWidthDLUs = 50;
 static const int kMinHeightDLUs = 14;
 #endif
 
 
 // Default space between the icon and text.
 static const int kDefaultIconTextSpacing = 5;
 
-// Preferred padding between text and edge
+// Preferred padding between text and edge.
 static const int kPreferredPaddingHorizontal = 6;
 static const int kPreferredPaddingVertical = 5;
 
-// Preferred padding between text and edge for NativeTheme border
+// Preferred padding between text and edge for NativeTheme border.
 static const int kPreferredNativeThemePaddingHorizontal = 12;
 static const int kPreferredNativeThemePaddingVertical = 5;
 
+// By default the focus rect is drawn at the border of the view.
+// For a button, we inset the focus rect by 3 pixels so that it
+// doesn't draw on top of the button's border. This roughly matches
+// how the Windows native focus rect for buttons looks. A subclass
+// that draws a button with different padding may need to
+// override OnPaintFocusBorder and do something different.
+static const int kFocusRectInset = 3;
+
 // Default background color for buttons.
 const SkColor kBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
 
 #if defined(USE_AURA)
 // static
 const SkColor TextButtonBase::kEnabledColor = SkColorSetRGB(0x44, 0x44, 0x44);
 // static
 const SkColor TextButtonBase::kHighlightColor = SkColorSetRGB(0, 0, 0);
 // static
 const SkColor TextButtonBase::kDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
@@ skipping 682 matching lines @@
 }
 
 void TextButton::set_ignore_minimum_size(bool ignore_minimum_size) {
   ignore_minimum_size_ = ignore_minimum_size;
 }
 
 std::string TextButton::GetClassName() const {
   return kViewClassName;
 }
 
+void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
+  if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+    gfx::Rect rect(GetLocalBounds());
+    rect.Inset(kFocusRectInset, kFocusRectInset);
+    canvas->DrawFocusRect(rect);
+  }
+}
+
 gfx::NativeTheme::Part TextButton::GetThemePart() const {
   return gfx::NativeTheme::kPushButton;
 }
 
 void TextButton::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
   TextButtonBase::GetExtraParams(params);
   params->button.is_default = is_default_;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
@@ skipping 61 matching lines @@
 gfx::Size NativeTextButton::GetMinimumSize() {
   return GetPreferredSize();
 }
 
 std::string NativeTextButton::GetClassName() const {
   return kViewClassName;
 }
 
 void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
 #if defined(OS_WIN)
-  // On windows, make sure the focus border is inset wrt the entire button so
-  // that the native text button appears more like a windows button.
   if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
     gfx::Rect rect(GetLocalBounds());
-    rect.Inset(3, 3);
+    rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
   }
 #else
   TextButton::OnPaintFocusBorder(canvas);
 #endif
 }
 
 void NativeTextButton::GetExtraParams(
     gfx::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 }
 
 }  // namespace views