7 files changed, 5 insertions, 14 deletions
diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
index 1221efa..ef36dc1 100644
--- a/ui/views/controls/button/checkbox.cc
+++ b/ui/views/controls/button/checkbox.cc
@@ -61,7 +61,7 @@ void Checkbox::GetAccessibleState(ui::AccessibleViewState* state) {
 }
 
 void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (IsFocusable() || IsAccessibilityFocusableInRootView())) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusableInRootView())) {
     gfx::Rect bounds(GetTextBounds());
     // Increate the bounding box by one on each side so that that focus border
     // does not draw on top of the letters.
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index d46ad12..78b59e1 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -279,10 +279,6 @@ void CustomButton::ViewHierarchyChanged(bool is_add, View *parent,
     SetState(BS_NORMAL);
 }
 
-bool CustomButton::IsFocusable() const {
-  return (state_ != BS_DISABLED) && View::IsFocusable();
-}
-
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index b428e0a..4e22fbc 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -118,7 +118,6 @@ class VIEWS_EXPORT CustomButton : public Button,
   virtual void ViewHierarchyChanged(bool is_add,
                                     View* parent,
                                     View* child) OVERRIDE;
-  virtual bool IsFocusable() const OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
   // The button state (defined in implementation)
diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index 46b37b3..38a8021 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -753,7 +753,7 @@ std::string TextButton::GetClassName() const {
 }
 
 void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+  if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
@@ -841,7 +841,7 @@ std::string NativeTextButton::GetClassName() const {
 
 void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
 #if defined(OS_WIN)
-  if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+  if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 5fc6f86..9972443 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -182,7 +182,7 @@ void Label::SetHasFocusBorder(bool has_focus_border) {
 
 gfx::Insets Label::GetInsets() const {
   gfx::Insets insets = View::GetInsets();
-  if (IsFocusable() || has_focus_border_)  {
+  if (focusable() || has_focus_border_)  {
     insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,
                           kFocusBorderPadding, kFocusBorderPadding);
   }
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index ffbabe0..e2beb4d 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -92,6 +92,7 @@ TextfieldController* Textfield::GetController() const {
 
 void Textfield::SetReadOnly(bool read_only) {
   read_only_ = read_only;
+  set_focusable(!read_only);
   if (native_wrapper_) {
     native_wrapper_->UpdateReadOnly();
     native_wrapper_->UpdateTextColor();
@@ -330,10 +331,6 @@ gfx::Size Textfield::GetPreferredSize() {
                        insets.width(), font_.GetHeight() + insets.height());
 }
 
-bool Textfield::IsFocusable() const {
-  return View::IsFocusable() && !read_only_;
-}
-
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll();
 }
diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
index 5ff542d..b976354 100644
--- a/ui/views/controls/textfield/textfield.h
+++ b/ui/views/controls/textfield/textfield.h
@@ -225,7 +225,6 @@ class VIEWS_EXPORT Textfield : public View {
   // Overridden from View:
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual bool IsFocusable() const OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
   virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE;
   virtual void OnEnabledChanged() OVERRIDE;