Move text_elider to gfx.

chrome/browser/ui/gtk/status_bubble_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/status_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/text_elider.h"
 
 namespace {
 
 // Inner padding between the border and the text label.
 const int kInternalTopBottomPadding = 1;
 const int kInternalLeftRightPadding = 2;
 
 // The radius of the edges of our bubble.
 const int kCornerSize = 3;
 
@@ skipping 71 matching lines @@
     expand_timer_.Stop();
     expand_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpandHoverDelay),
                         this, &StatusBubbleGtk::ExpandURL);
     // When not expanded, we limit the size to one third the browser's
     // width.
     desired_width /= 3;
   }
 
   // TODO(tc): We don't actually use gfx::Font as the font in the status
-  // bubble.  We should extend ui::ElideUrl to take some sort of pango font.
+  // bubble.  We should extend gfx::ElideUrl to take some sort of pango font.
   url_text_ = UTF16ToUTF8(
-      ui::ElideUrl(url_, gfx::Font(), desired_width, languages_));
+      gfx::ElideUrl(url_, gfx::Font(), desired_width, languages_));
   SetStatusTextTo(url_text_);
 }
 
 void StatusBubbleGtk::Show() {
   // If we were going to hide, stop.
   hide_timer_.Stop();
 
   gtk_widget_show(container_.get());
   GdkWindow* gdk_window = gtk_widget_get_window(container_.get());
   if (gdk_window)
@@ skipping 243 matching lines @@
   return FALSE;
 }
 
 void StatusBubbleGtk::AnimationEnded(const ui::Animation* animation) {
   UpdateLabelSizeRequest();
 }
 
 void StatusBubbleGtk::AnimationProgressed(const ui::Animation* animation) {
   UpdateLabelSizeRequest();
 }