Add an 'obscured' flag to views::Label.

ui/views/controls/label_unittest.cc

 // 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.
 
 #include "ui/views/controls/label.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 80 matching lines @@
 
 TEST(LabelTest, MultiLineProperty) {
   Label label;
   EXPECT_FALSE(label.is_multi_line());
   label.SetMultiLine(true);
   EXPECT_TRUE(label.is_multi_line());
   label.SetMultiLine(false);
   EXPECT_FALSE(label.is_multi_line());
 }
 
+TEST(LabelTest, ObscuredProperty) {
+  Label label;
+  base::string16 test_text(ASCIIToUTF16("Password!"));
+  label.SetText(test_text);
+
+  // Should be false by default...
+  EXPECT_FALSE(label.is_obscured());
+  EXPECT_EQ(ASCIIToUTF16("Password!"), label.display_text());

[msw, 2014/04/03 01:38:48]

nit: re-use test_text here and below.

+
+  label.SetObscured(true);
+  EXPECT_TRUE(label.is_obscured());
+  EXPECT_EQ(base::WideToUTF16(
+                L"\x2022\x2022\x2022\x2022\x2022\x2022\x2022\x2022\x2022"),
+            label.display_text());
+

[msw, 2014/04/03 01:38:48]

nit: test that a SetText call while the Label is obscured works as expected.

+  label.SetObscured(false);
+  EXPECT_FALSE(label.is_obscured());
+  EXPECT_EQ(ASCIIToUTF16("Password!"), label.display_text());
+}
+
 TEST(LabelTest, TooltipProperty) {
   Label label;
   base::string16 test_text(ASCIIToUTF16("My cool string."));
   label.SetText(test_text);
 
   base::string16 tooltip;
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(test_text, tooltip);
 
   base::string16 tooltip_text(ASCIIToUTF16("The tooltip!"));
@@ skipping 15 matching lines @@
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
   // Clear out the tooltip.
   label.SetTooltipText(empty_text);
 
   // Shrink the bounds and the tooltip should come back.
   label.SetBounds(0, 0, 1, 1);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
 
-  // Make the label multiline and there is no tooltip again.
+  // Make the label obscured and there is no tooltip.
+  label.SetObscured(true);
+  EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip));
+  label.SetObscured(false);

[msw, 2014/04/03 01:38:48]

nit: after this call, EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
(ensure that the obscured flag doesn't permanently clobber the tooltip)

[msw, 2014/04/03 18:27:48]

ping.

[Mike West, 2014/04/04 07:05:15]

Done.

+
+  // Make the label multiline and there is no tooltip.
   label.SetMultiLine(true);
   EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip));
 
   // Verify that setting the tooltip still shows it.
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
   // Clear out the tooltip.
   label.SetTooltipText(empty_text);
 }
@@ skipping 766 matching lines @@
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(2, 51)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20)));
 
   // GetTooltipHandlerForPoint works should work in child bounds.
   label.SetBounds(2, 2, 10, 10);
   EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11)));
 }
 
 }  // namespace views