Fix focus rectangle for label.

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 117 matching lines @@
   void Layout() override;
   const char* GetClassName() const override;
   View* GetTooltipHandlerForPoint(const gfx::Point& point) override;
   bool CanProcessEventsWithinSubtree() const override;
   void GetAccessibleState(ui::AXViewState* state) override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
   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_; }
 
   // View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void VisibilityChanged(View* starting_from, bool is_visible) override;
   void OnPaint(gfx::Canvas* canvas) override;
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
  private:
   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);
 
   void ResetLayout();
 
   // Create a single RenderText instance to actually be painted.
   scoped_ptr<gfx::RenderText> CreateRenderText(
       const base::string16& text,
       gfx::HorizontalAlignment alignment,
       gfx::DirectionalityMode directionality,
@@ skipping 48 matching lines @@
   // TODO(vadimt): Remove is_first_paint_text_ before crbug.com/431326 is
   // closed.
   bool is_first_paint_text_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_