Move text_elider to gfx.

ui/message_center/views/bounded_label.cc

 // Copyright 2013 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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 const size_t kPreferredLinesCacheSize = 10;
 const size_t kPreferredSizeCacheSize = 10;
 
 }  // namespace
 
 namespace message_center {
@@ skipping 113 matching lines @@
     height = (lines + 1) * line_height;
   }
 
   // Try to ensure that the width is no smaller than the width of the text's
   // characters to avoid the http://crbug.com/237700 infinite loop.
   // TODO(dharcourt): Remove when http://crbug.com/237700 is fixed.
   width = std::max(width, 2 * font().GetStringWidth(UTF8ToUTF16("W")));
 
   // Wrap, using INT_MAX for -1 widths that indicate no wrapping.
   std::vector<string16> wrapped;
-  ui::ElideRectangleText(text(), font(),
+  gfx::ElideRectangleText(text(), font(),
                          (width < 0) ? std::numeric_limits<int>::max() : width,
-                         height, ui::WRAP_LONG_WORDS, &wrapped);
+                         height, gfx::WRAP_LONG_WORDS, &wrapped);
 
   // Elide if necessary.
   if (lines > 0 && wrapped.size() > static_cast<unsigned int>(lines)) {
     // Add an ellipsis to the last line. If this ellipsis makes the last line
-    // too wide, that line will be further elided by the ui::ElideText below,
+    // too wide, that line will be further elided by the gfx::ElideText below,
     // so for example "ABC" could become "ABC..." and then "AB...".
-    string16 last = wrapped[lines - 1] + UTF8ToUTF16(ui::kEllipsis);
+    string16 last = wrapped[lines - 1] + UTF8ToUTF16(gfx::kEllipsis);
     if (width > 0 && font().GetStringWidth(last) > width)
-      last = ui::ElideText(last, font(), width, ui::ELIDE_AT_END);
+      last = gfx::ElideText(last, font(), width, gfx::ELIDE_AT_END);
     wrapped.resize(lines - 1);
     wrapped.push_back(last);
   }
 
   return wrapped;
 }
 
 void InnerBoundedLabel::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   ClearCaches();
   views::Label::OnBoundsChanged(previous_bounds);
@@ skipping 170 matching lines @@
 
 void BoundedLabel::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   label_->SetNativeTheme(theme);
 }
 
 string16 BoundedLabel::GetWrappedTextForTest(int width, int lines) {
   return JoinString(label_->GetWrappedText(width, lines), '\n');
 }
 
 }  // namespace message_center