Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / views / examples / label_example.cc

diff --git a/src/ui/views/examples/label_example.cc b/src/ui/views/examples/label_example.cc
index d970bf1..2f82a40 100644 (file)
--- a/src/ui/views/examples/label_example.cc
+++ b/src/ui/views/examples/label_example.cc
@@ -10,6 +10,9 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
+using base::ASCIIToUTF16;
+using base::WideToUTF16;
+
 namespace views {
 namespace examples {
 
@@ -21,7 +24,7 @@ class PreferredSizeLabel : public Label {
   PreferredSizeLabel();
   virtual ~PreferredSizeLabel();
 
-  // Overridden from Label:
+  // Label:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
@@ -29,7 +32,7 @@ class PreferredSizeLabel : public Label {
 };
 
 PreferredSizeLabel::PreferredSizeLabel() : Label() {
-  set_border(Border::CreateSolidBorder(2, SK_ColorCYAN));
+  SetBorder(Border::CreateSolidBorder(2, SK_ColorCYAN));
 }
 
 PreferredSizeLabel::~PreferredSizeLabel() {}
@@ -64,7 +67,7 @@ void LabelExample::CreateExampleView(View* container) {
   container->AddChildView(label);
 
   label = new Label(ASCIIToUTF16("A Courier-18 label with a shadow."));
-  label->SetFont(gfx::Font("Courier", 18));
+  label->SetFontList(gfx::FontList("Courier, 18px"));
   label->SetShadowColors(SK_ColorGRAY, SK_ColorLTGRAY);
   label->SetShadowOffset(1, 1);
   container->AddChildView(label);
@@ -79,6 +82,10 @@ void LabelExample::CreateExampleView(View* container) {
       "lines if the text's width exceeds the label's available width."));
   label->SetMultiLine(true);
   container->AddChildView(label);
+
+  label = new Label(WideToUTF16(L"Password!"));
+  label->SetObscured(true);
+  container->AddChildView(label);
 }
 
 }  // namespace examples