Move text_elider to gfx.

chrome/browser/ui/gtk/avatar_menu_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/avatar_menu_item_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.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/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.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/gtk/gtk_hig_constants.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/gtk_util.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/text_elider.h"
 
 namespace {
 
 // A checkmark is drawn in the lower-right corner of the active avatar image.
 // This value is the x offset, in pixels, from that position.
 const int kCheckMarkXOffset = 2;
 
 // The maximum width of a user name in pixels. Anything longer than this will be
 // elided.
 const int kUserNameMaxWidth = 200;
@@ skipping 183 matching lines @@
   }
 
   GtkWidget* avatar_image = gtk_image_new_from_pixbuf(avatar_pixbuf);
   g_object_unref(avatar_pixbuf);
   gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0);
   gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0);
 
   // The user name label.
   GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0);
   GtkWidget* name_label = NULL;
-  string16 elided_name = ui::ElideText(item_.name,
+  string16 elided_name = gfx::ElideText(item_.name,
                                        gfx::Font(),
                                        kUserNameMaxWidth,
-                                       ui::ELIDE_AT_END);
+                                       gfx::ELIDE_AT_END);
 
   name_label = theme_service->BuildLabel(UTF16ToUTF8(elided_name),
                                          ui::kGdkBlack);
   if (item_.active) {
     char* markup = g_markup_printf_escaped(
         "<span weight='bold'>%s</span>", UTF16ToUTF8(elided_name).c_str());
     gtk_label_set_markup(GTK_LABEL(name_label), markup);
     g_free(markup);
   }
 
@@ skipping 36 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }