Fix focus rects for checkboxes and radio buttons:...

chrome/views/controls/label.h

 // Copyright (c) 2006-2008 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 CHROME_VIEWS_CONTROLS_LABEL_H_
 #define CHROME_VIEWS_CONTROLS_LABEL_H_
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
@@ skipping 135 matching lines @@
   virtual void OnMouseExited(const MouseEvent& event);
 
   // The background color to use when the mouse is over the label. Label
   // takes ownership of the Background.
   void SetMouseOverBackground(Background* background);
   const Background* GetMouseOverBackground() const;
 
   // Sets the enabled state. Setting the enabled state resets the color.
   virtual void SetEnabled(bool enabled);
 
+  // Overridden from View:
+  virtual gfx::Insets GetInsets() const;
+
   // Resizes the label so its width is set to the width of the longest line and
   // its height deduced accordingly.
   // This is only intended for multi-line labels and is useful when the label's
   // text contains several lines separated with \n.
   // |max_width| is the maximum width that will be used (longer lines will be
   // wrapped).  If 0, no maximum width is enforced.
   void SizeToFit(int max_width);
 
 #if defined(OS_WIN)
   // TODO(port): Make portable equivalents of accessibility-related functions.
@@ skipping 11 matching lines @@
   // Overriden from View.
   virtual bool GetAccessibleState(VARIANT* state);
 #endif  // defined(OS_WIN)
 
   // Gets/sets the flag to determine whether the label should be collapsed when
   // it's hidden (not visible). If this flag is true, the label will return a
   // preferred size of (0, 0) when it's not visible.
   void set_collapse_when_hidden(bool value) { collapse_when_hidden_ = value; }
   bool collapse_when_hidden() const { return collapse_when_hidden_; }
 
+  void set_paint_as_focused(bool paint_as_focused) {
+    paint_as_focused_ = paint_as_focused;
+  }
+
  private:
   // These tests call CalculateDrawStringParams in order to verify the
   // calculations done for drawing text.
   FRIEND_TEST(LabelTest, DrawSingleLineString);
   FRIEND_TEST(LabelTest, DrawMultiLineString);
 
   static ChromeFont GetDefaultFont();
 
   // Returns parameters to be used for the DrawString call.
   void CalculateDrawStringParams(std::wstring* paint_text,
@@ skipping 27 matching lines @@
   std::wstring tooltip_text_;
   // Whether the mouse is over this label.
   bool contains_mouse_;
   scoped_ptr<Background> mouse_over_background_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // The following member variable is used to control whether the alignment
   // needs to be flipped around for RTL locales. Please refer to the definition
   // of RTLAlignmentMode for more information.
   RTLAlignmentMode rtl_alignment_mode_;
+  // When embedded in a larger control that is focusable, setting this flag
+  // allows this view to be painted as focused even when it is itself not.
+  bool paint_as_focused_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_CONTROLS_LABEL_H_