Move text_elider to gfx.

ui/views/corewm/tooltip_controller.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/corewm/tooltip_controller.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/strings/string_split.h"
 #include "base/time/time.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace {
 
 const SkColor kTooltipBackground = 0xFFFFFFCC;
@@ skipping 365 matching lines @@
       current_width += word_width;
       line.append(word);
     }
     result_lines.push_back(line);
   }
 
   // Clamp number of lines to |kMaxLines|.
   if (result_lines.size() > kMaxLines) {
     result_lines.resize(kMaxLines);
     // Add ellipses character to last line.
-    result_lines[kMaxLines - 1] = ui::TruncateString(
+    result_lines[kMaxLines - 1] = gfx::TruncateString(
         result_lines.back(), result_lines.back().length() - 1);
   }
   *line_count = result_lines.size();
 
   // Flatten the result.
   string16 result;
   for (std::vector<string16>::iterator l = result_lines.begin();
       l != result_lines.end(); ++l) {
     if (!result.empty())
       result.push_back('\n');
     int line_width = font.GetStringWidth(*l);
     // Since we only break at word boundaries, it could happen that due to some
     // very long word, line_width is greater than the available_width. In such
     // case, we simply truncate at available_width and add ellipses at the end.
     if (line_width > available_width) {
       *width = available_width;
-      result.append(ui::ElideText(*l, font, available_width, ui::ELIDE_AT_END));
+      result.append(gfx::ElideText(*l, font, available_width,
+                                   gfx::ELIDE_AT_END));
     } else {
       *width = std::max(*width, line_width);
       result.append(*l);
     }
   }
   *text = result;
 }
 
 void TooltipController::TooltipTimerFired() {
   UpdateIfRequired();
@@ skipping 94 matching lines @@
 int TooltipController::GetTooltipShownTimeout() {
   std::map<aura::Window*, int>::const_iterator it =
       tooltip_shown_timeout_map_.find(tooltip_window_);
   if (it == tooltip_shown_timeout_map_.end())
     return kDefaultTooltipShownTimeoutMs;
   return it->second;
 }
 
 }  // namespace corewm
 }  // namespace views