Add fade eliding for Views Labels; related cleanup.

ui/views/examples/label_example.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/examples/label_example.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 using base::ASCIIToUTF16;
 using base::WideToUTF16;
 
 namespace views {
 namespace examples {
 
 namespace {
 
 // A Label with a constrained preferred size to demonstrate eliding or wrapping.
 class PreferredSizeLabel : public Label {
  public:
-  PreferredSizeLabel();
-  virtual ~PreferredSizeLabel();
+  PreferredSizeLabel() : Label() {
+    SetBorder(Border::CreateSolidBorder(2, SK_ColorCYAN));
+  }
+  virtual ~PreferredSizeLabel() {}
 
   // Label:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+    return gfx::Size(100, 40);
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PreferredSizeLabel);
 };
 
-PreferredSizeLabel::PreferredSizeLabel() : Label() {
-  SetBorder(Border::CreateSolidBorder(2, SK_ColorCYAN));
-}
-
-PreferredSizeLabel::~PreferredSizeLabel() {}
-
-gfx::Size PreferredSizeLabel::GetPreferredSize() const {
-  return gfx::Size(100, 40);
-}
-
 }  // namespace
 
 LabelExample::LabelExample() : ExampleBase("Label") {}
 
 LabelExample::~LabelExample() {}
 
 void LabelExample::CreateExampleView(View* container) {
   // A very simple label example, followed by additional helpful examples.
   container->SetLayoutManager(new BoxLayout(BoxLayout::kVertical, 0, 0, 10));
   Label* label = new Label(ASCIIToUTF16("Hello world!"));
@@ skipping 20 matching lines @@
   label->SetShadowOffset(2, 2);
   label->set_halo_color(SK_ColorGREEN);
   container->AddChildView(label);
 
   label = new PreferredSizeLabel();
   label->SetText(ASCIIToUTF16("A long label will elide toward its logical end "
       "if the text's width exceeds the label's available width."));
   container->AddChildView(label);
 
   label = new PreferredSizeLabel();
+  label->SetElideBehavior(gfx::FADE_TAIL);
+  label->SetText(ASCIIToUTF16("Some long labels will fade, rather than elide, "
+      "if the text's width exceeds the label's available width."));
+  container->AddChildView(label);
+
+  label = new PreferredSizeLabel();
   label->SetText(ASCIIToUTF16("A multi-line label will wrap onto subsequent "
       "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
 }  // namespace views