Variety of tweaks to View API.

views/controls/label_unittest.cc

 // Copyright (c) 2010 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/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 177 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);
+  label.set_focusable(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 62 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);
+  label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
 
   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 97 matching lines @@
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 }
 
 // On Linux the underlying pango routines require a max height in order to
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
 TEST(LabelTest, DrawMultiLineString) {
   Label label;
-  label.SetFocusable(false);
+  label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
 
   std::wstring test_text(L"Another string\nwith returns\n\n!");
   label.SetText(test_text);
   label.SetMultiLine(true);
   label.SizeToFit(0);
   gfx::Size extra(50, 10);
@@ skipping 126 matching lines @@
   EXPECT_EQ(
       gfx::Canvas::MULTI_LINE |
       gfx::Canvas::TEXT_ALIGN_RIGHT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 }
 
 TEST(LabelTest, DrawSingleLineStringInRTL) {
   Label label;
-  label.SetFocusable(false);
+  label.set_focusable(false);
 
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
   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,
                   0,
@@ skipping 100 matching lines @@
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 // On Linux the underlying pango routines require a max height in order to
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
 TEST(LabelTest, DrawMultiLineStringInRTL) {
   Label label;
-  label.SetFocusable(false);
+  label.set_focusable(false);
 
   // Test for RTL.
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
   std::wstring test_text(L"Another string\nwith returns\n\n!");
   label.SetText(test_text);
   label.SetMultiLine(true);
   label.SizeToFit(0);
   gfx::Size extra(50, 10);
@@ skipping 128 matching lines @@
       gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
   // Reset Locale
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views