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

chrome/views/controls/label_unittest.cc

 // 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.
 
 #include "base/string_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/border.h"
 #include "chrome/views/controls/label.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 175 matching lines @@
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
             required_size.height() + border.height());
   EXPECT_EQ(required_size_with_border.width(),
             required_size.width() + border.width());
 }
 
 TEST(LabelTest, MultiLineSizing) {
   Label label;
+  label.SetFocusable(false);
   std::wstring test_text(L"A random string\nwith multiple lines\nand returns!");
   label.SetText(test_text);
   label.SetMultiLine(true);
 
   // GetPreferredSize
   gfx::Size required_size = label.GetPreferredSize();
   EXPECT_GT(required_size.height(), kMinTextDimension);
   EXPECT_GT(required_size.width(), kMinTextDimension);
 
   // SizeToFit with unlimited width.
@@ skipping 50 matching lines @@
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
             required_size.height() + border.height());
   EXPECT_EQ(required_size_with_border.width(),
             required_size.width() + border.width());
 }
 
 TEST(LabelTest, DrawSingleLineString) {
   Label label;
+  label.SetFocusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.EnableUIMirroringForRTLLanguages(false);
 
   std::wstring test_text(L"Here's a string with no returns.");
   label.SetText(test_text);
   gfx::Size required_size(label.GetPreferredSize());
   gfx::Size extra(22, 8);
   label.SetBounds(0,
@@ skipping 94 matching lines @@
   // The text should be right aligned horizontally and centered vertically.
   EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 }
 
 TEST(LabelTest, DrawMultiLineString) {
   Label label;
+  label.SetFocusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.EnableUIMirroringForRTLLanguages(false);
 
   std::wstring test_text(L"Another string\nwith returns\n\n!");
   label.SetText(test_text);
   label.SetMultiLine(true);
   label.SizeToFit(0);
 
@@ skipping 45 matching lines @@
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_STREQ(test_text.c_str(), paint_text.c_str());
   EXPECT_EQ(center_bounds.x() + border.left(), text_bounds.x());
   EXPECT_EQ(center_bounds.y() + border.top(), text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_CENTER, flags);
 }
 
 }  // namespace views