Views: Don't add insets for views::Link focus rings under MD.

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/macros.h"
@@ skipping 13 matching lines @@
 // A view subclass that can display a string.
 class VIEWS_EXPORT Label : public View,
                            public ContextMenuController,
                            public WordLookupClient,
                            public SelectionControllerDelegate,
                            public ui::SimpleMenuModel::Delegate {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
-  // The padding for the focus border when rendering focused text.
-  static const int kFocusBorderPadding;
-
   // Helper to construct a Label that doesn't use the views typography spec.
   // Using this causes Label to obtain colors from ui::NativeTheme and line
   // spacing from gfx::FontList::GetHeight().
   // TODO(tapted): Audit users of this class when MD is default. Then add
   // foreground/background colors, line spacing and everything else that
   // views::TextContext abstracts away so the separate setters can be removed.
   struct CustomFont {
     // TODO(tapted): Change this to a size delta and font weight since that's
     // typically all the callers really care about, and would allow Label to
     // guarantee caching of the FontList in ResourceBundle.
@@ skipping 152 matching lines @@
   void SelectAll();
 
   // Clears any active selection.
   void ClearSelection();
 
   // Selects the given text range. NO-OP if the label is not selectable or the
   // |range| endpoints don't lie on grapheme boundaries.
   void SelectRange(const gfx::Range& range);
 
   // View:
-  gfx::Insets GetInsets() const override;
   int GetBaseline() const override;
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   int GetHeightForWidth(int w) const override;
   void Layout() override;
   const char* GetClassName() const override;
   View* GetTooltipHandlerForPoint(const gfx::Point& point) override;
   bool CanProcessEventsWithinSubtree() const override;
   WordLookupClient* GetWordLookupClient() override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
   void OnEnabledChanged() override;
 
  protected:
   // Create a single RenderText instance to actually be painted.
   virtual std::unique_ptr<gfx::RenderText> CreateRenderText(
       const base::string16& text,
       gfx::HorizontalAlignment alignment,
       gfx::DirectionalityMode directionality,
       gfx::ElideBehavior elide_behavior) const;
 
+  // Draw a focus ring. The default implementation does nothing.
+  virtual void PaintFocusRing(gfx::Canvas* canvas) const;
+  gfx::Rect GetFocusRingBounds() const;
+
   void PaintText(gfx::Canvas* canvas);
 
   // 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;
   gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
   void OnFocus() override;
   void OnBlur() override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseCaptureLost() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   bool CanHandleAccelerators() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(LabelTest, ResetRenderTextData);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, MultilineSupportedRenderText);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, TextChangeWithoutLayout);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, EmptyLabel);
-  FRIEND_TEST_ALL_PREFIXES(LabelTest, FocusBounds);
+  FRIEND_TEST_ALL_PREFIXES(MDLabelTest, FocusBounds);
   FRIEND_TEST_ALL_PREFIXES(LabelTest, MultiLineSizingWithElide);
   friend class LabelSelectionTest;
 
   // ContextMenuController overrides:
   void ShowContextMenuForView(View* source,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override;
 
   // WordLookupClient overrides:
   bool GetDecoratedWordAtPoint(const gfx::Point& point,
@@ skipping 23 matching lines @@
 
   const gfx::RenderText* GetRenderTextForSelectionController() const;
 
   void Init(const base::string16& text, const gfx::FontList& font_list);
 
   void ResetLayout();
 
   // Set up |lines_| to actually be painted.
   void MaybeBuildRenderTextLines() const;
 
-  gfx::Rect GetFocusBounds() const;
-
   // Get the text broken into lines as needed to fit the given |width|.
   std::vector<base::string16> GetLinesForWidth(int width) const;
 
   // Get the text size for the current layout.
   gfx::Size GetTextSize() const;
 
   // Updates |actual_{enabled,disabled}_color_| from requested colors.
   void RecalculateColors();
 
   // Applies |actual_{enabled,disabled}_color_| to |lines_|.
@@ skipping 65 matching lines @@
   // Context menu related members.
   ui::SimpleMenuModel context_menu_contents_;
   std::unique_ptr<views::MenuRunner> context_menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_