Move gfx::ElideText functionality to RenderText.

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/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/examples/example_combobox_model.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 
 using base::ASCIIToUTF16;
 using base::WideToUTF16;
 
 namespace views {
 namespace examples {
 
 namespace {
 
-const char* kElideBehaviors[] = { "Truncate", "Elide Head", "Elide Middle",
-                                  "Elide Tail", "Elide Email", "Fade Tail" };
+const char* kElideBehaviors[] = { "No Elide", "Truncate", "Elide Head",
+    "Elide Middle", "Elide Tail", "Elide Email", "Fade Tail" };
 const char* kAlignments[] = { "Left", "Center", "Right", "Head" };
 
 // A Label with a clamped preferred width to demonstrate eliding or wrapping.
 class PreferredSizeLabel : public Label {
  public:
   PreferredSizeLabel() : Label() {
     SetBorder(Border::CreateSolidBorder(1, SK_ColorGRAY));
   }
   virtual ~PreferredSizeLabel() {}
 
@@ skipping 143 matching lines @@
   shadows_->set_listener(this);
   layout->AddView(shadows_);
   layout->AddPaddingRow(0, 8);
 
   column_set = layout->AddColumnSet(2);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
                         1, GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 2);
   custom_label_ = new PreferredSizeLabel();
   custom_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  custom_label_->SetElideBehavior(gfx::TRUNCATE);
+  custom_label_->SetElideBehavior(gfx::NO_ELIDE);
   custom_label_->SetText(textfield_->text());
   layout->AddView(custom_label_);
 
   container->AddChildView(control_container);
 }
 
 Combobox* LabelExample::AddCombobox(GridLayout* layout,
                                     const char* name,
                                     const char** strings,
                                     int count) {
   layout->StartRow(0, 0);
   layout->AddView(new Label(base::ASCIIToUTF16(name)));
   ExampleComboboxModel* model = new ExampleComboboxModel(strings, count);
   example_combobox_models_.push_back(model);
   Combobox* combobox = new Combobox(model);
   combobox->SetSelectedIndex(0);
   combobox->set_listener(this);
   layout->AddView(combobox);
   return combobox;
 }
 
 }  // namespace examples
 }  // namespace views