Fix focus rectangle for label.

ui/views/controls/label.h

Index: ui/views/controls/label.h
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index 4ecbfe12f70b8700bfc13ef6a0d6e9c3d62bb8af..35c59c3e8edc86658cf955ceb61d3dce99b8ee56 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -135,7 +135,10 @@ class VIEWS_EXPORT Label : public View {
   void OnEnabledChanged() override;
 
  protected:
-  void PaintText(gfx::Canvas* canvas);
+  // Paints the display text to |canvas|. It also draws the focus rectangle if
+  // necessary. Returns the bounds of the focus rectangle (or an empty rectangle
+  // if this is not focusable).
+  gfx::Rect PaintText(gfx::Canvas* canvas);
 
   SkColor disabled_color() const { return actual_disabled_color_; }
 
@@ -150,6 +153,7 @@ class VIEWS_EXPORT Label : public View {
   FRIEND_TEST_ALL_PREFIXES(LabelTest, ResetRenderTextData);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, MultilineSupportedRenderText);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, TextChangeWithoutLayout);
+  FRIEND_TEST_ALL_PREFIXES(LabelFocusTest, FocusBounds);
 
   void Init(const base::string16& text, const gfx::FontList& font_list);