Add fade eliding for Views Labels; related cleanup.

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
   // UI's directionality as the label's directionality.
   //
   // If the text originates from a web page, its directionality is determined
   // based on its first character with strong directionality, disregarding what
   // directionality the Chrome UI is.
   enum DirectionalityMode {
     USE_UI_DIRECTIONALITY = 0,
     AUTO_DETECT_DIRECTIONALITY
   };
 
-  enum ElideBehavior {
-    NO_ELIDE,            // Do not elide the label text; truncate as needed.
-    ELIDE_AT_BEGINNING,  // Add ellipsis at the start of the string as needed.
-    ELIDE_IN_MIDDLE,     // Add ellipsis in the middle of the string as needed.
-    ELIDE_AT_END,        // Add ellipsis at the end of the string as needed.
-    ELIDE_AS_EMAIL,      // Elide while retaining username/domain chars
-                         // as needed.
-  };
-
   // Internal class name.
   static const char kViewClassName[];
 
   // The padding for the focus border when rendering focused text.
   static const int kFocusBorderPadding;
 
   Label();
   explicit Label(const base::string16& text);
   Label(const base::string16& text, const gfx::FontList& font_list);
   virtual ~Label();
@@ skipping 79 matching lines @@
   bool is_obscured() const { return is_obscured_; }
   void SetObscured(bool obscured);
 
   // Get the text as displayed to the user, respecting the 'obscured' flag.
   const base::string16& layout_text() const { return layout_text_; }
 
   // Sets whether the label text can be split on words.
   // Default is false. This only works when is_multi_line is true.
   void SetAllowCharacterBreak(bool allow_character_break);
 
-  // Sets whether the label text should be elided in the middle or end (if
-  // necessary). The default is to elide at the end.
-  // NOTE: Eliding in the middle is not supported for multi-line strings.
-  void SetElideBehavior(ElideBehavior elide_behavior);
+  // Sets the eliding or fading behavior, applied as necessary. The default is
+  // to elide at the end. Eliding is not well supported for multi-line labels.
+  void SetElideBehavior(gfx::ElideBehavior elide_behavior);
 
   // Sets the tooltip text.  Default behavior for a label (single-line) is to
   // show the full text if it is wider than its bounds.  Calling this overrides
   // the default behavior and lets you set a custom tooltip.  To revert to
   // default behavior, call this with an empty string.
   void SetTooltipText(const base::string16& tooltip_text);
 
   // Resizes the label so its width is set to the width of the longest line and
   // its height deduced accordingly.
   // This is only intended for multi-line labels and is useful when the label's
@@ skipping 103 matching lines @@
   bool disabled_color_set_;
   bool background_color_set_;
 
   bool auto_color_readability_;
   mutable gfx::Size text_size_;
   mutable bool text_size_valid_;
   int line_height_;
   bool is_multi_line_;
   bool is_obscured_;
   bool allow_character_break_;
-  ElideBehavior elide_behavior_;
+  gfx::ElideBehavior elide_behavior_;
   gfx::HorizontalAlignment horizontal_alignment_;
   base::string16 tooltip_text_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // The following member variable is used to control whether the
   // directionality is auto-detected based on first strong directionality
   // character or is determined by chrome UI's locale.
   DirectionalityMode directionality_mode_;
 
   // Colors for shadow.
@@ skipping 15 matching lines @@
   // The cached heights to avoid recalculation in GetHeightForWidth().
   mutable std::vector<gfx::Size> cached_heights_;
   mutable int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_