Move text_elider to gfx.

ash/system/user/tray_user.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 "ash/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 383 matching lines @@
 
 void PublicAccountUserDetails::Layout() {
   lines_.clear();
   const gfx::Rect contents_area = GetContentsBounds();
   if (contents_area.IsEmpty())
     return;
 
   // Word-wrap the label text.
   const gfx::Font font;
   std::vector<base::string16> lines;
-  ui::ElideRectangleText(text_, font, contents_area.width(),
-                         contents_area.height(), ui::ELIDE_LONG_WORDS, &lines);
+  gfx::ElideRectangleText(text_, font, contents_area.width(),
+                          contents_area.height(), gfx::ELIDE_LONG_WORDS,
+                          &lines);
   // Loop through the lines, creating a renderer for each.
   gfx::Point position = contents_area.origin();
   gfx::Range display_name(gfx::Range::InvalidRange());
   for (std::vector<base::string16>::const_iterator it = lines.begin();
        it != lines.end(); ++it) {
     gfx::RenderText* line = gfx::RenderText::CreateInstance();
     line->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_UI);
     line->SetText(*it);
     const gfx::Size size(contents_area.width(), line->GetStringSize().height());
     line->SetDisplayRect(gfx::Rect(position, size));
@@ skipping 76 matching lines @@
       bubble_view->GetMaximumSize().width() - (used_width + insets.width()));
   // Do a binary search for the minimum width that ensures no more than three
   // lines are needed. The lower bound is the minimum of the current bubble
   // width and the width of the link (as no wrapping is permitted inside the
   // link). The upper bound is the maximum of the largest allowed bubble width
   // and the sum of the label text and link widths when put on a single line.
   std::vector<base::string16> lines;
   while (min_width < max_width) {
     lines.clear();
     const int width = (min_width + max_width) / 2;
-    const bool too_narrow = ui::ElideRectangleText(
-        text_, font, width, INT_MAX, ui::TRUNCATE_LONG_WORDS, &lines) != 0;
+    const bool too_narrow = gfx::ElideRectangleText(
+        text_, font, width, INT_MAX, gfx::TRUNCATE_LONG_WORDS, &lines) != 0;
     int line_count = lines.size();
     if (!too_narrow && line_count == 3 &&
             width - font.GetStringWidth(lines.back()) <=
             space_width + link_size.width()) {
       ++line_count;
     }
     if (too_narrow || line_count > 3)
       min_width = width + 1;
     else
       max_width = width;
   }
 
   // Calculate the corresponding height and set the preferred size.
   lines.clear();
-  ui::ElideRectangleText(
-      text_, font, min_width, INT_MAX, ui::TRUNCATE_LONG_WORDS, &lines);
+  gfx::ElideRectangleText(
+      text_, font, min_width, INT_MAX, gfx::TRUNCATE_LONG_WORDS, &lines);
   int line_count = lines.size();
   if (min_width - font.GetStringWidth(lines.back()) <=
       space_width + link_size.width()) {
     ++line_count;
   }
   const int line_height = font.GetHeight();
   const int link_extra_height = std::max(
       link_size.height() - learn_more_->GetInsets().top() - line_height, 0);
   preferred_size_ = gfx::Size(
       min_width + insets.width(),
@@ skipping 701 matching lines @@
       kUserIconLargeSize : kUserIconSize;
 
   avatar_->SetImage(
       ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
           multiprofile_index_),
       gfx::Size(icon_size, icon_size));
 }
 
 }  // namespace internal
 }  // namespace ash