Move text_elider to gfx.

chrome/browser/ui/gtk/download/download_item_gtk.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 "chrome/browser/ui/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/slide_animation.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_skia_paint.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_utils_gtk.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 namespace {
 
 // The width of the |menu_button_| widget. It has to be at least as wide as the
 // bitmap that we use to draw it, i.e. 16, but can be more.
 const int kMenuButtonWidth = 16;
 
 // Padding on left and right of items in dangerous download prompt.
 const int kDangerousElementPadding = 3;
@@ skipping 436 matching lines @@
       download_model_.GetTooltipText(font_list, kTooltipMaxWidth);
   gtk_widget_set_tooltip_text(body_.get(), UTF16ToUTF8(tooltip_text).c_str());
 }
 
 void DownloadItemGtk::UpdateNameLabel() {
   const gfx::FontList& font_list =
       ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::BaseFont);
   string16 filename;
   if (!disabled_while_opening_) {
-    filename = ui::ElideFilename(
+    filename = gfx::ElideFilename(
         download()->GetFileNameToReportUser(), font_list, kTextWidth);
   } else {
     // First, Calculate the download status opening string width.
     string16 status_string =
         l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING, string16());
     int status_string_width = gfx::GetStringWidth(status_string, font_list);
     // Then, elide the file name.
     string16 filename_string =
-        ui::ElideFilename(download()->GetFileNameToReportUser(), font_list,
+        gfx::ElideFilename(download()->GetFileNameToReportUser(), font_list,
                           kTextWidth - status_string_width);
     // Last, concat the whole string.
     filename = l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING,
                                                  filename_string);
   }
 
   GdkColor color = theme_service_->GetGdkColor(
       ThemeProperties::COLOR_BOOKMARK_TEXT);
   gtk_util::SetLabelColor(
       name_label_,
@@ skipping 413 matching lines @@
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creation_time_);
   download()->ValidateDangerousDownload();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   download()->Remove();
 }