Move text_elider to gfx.

chrome/browser/ui/views/frame/global_menu_bar_x11.cc

 // Copyright 2013 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/views/frame/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
 
 // libdbusmenu-glib types
 typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
 typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)();
 typedef bool (*dbusmenu_menuitem_child_add_position_func)(
     DbusmenuMenuitem* parent,
     DbusmenuMenuitem* child,
     unsigned int position);
 typedef DbusmenuMenuitem* (*dbusmenu_menuitem_child_append_func)(
     DbusmenuMenuitem* parent,
@@ skipping 472 matching lines @@
 
 void GlobalMenuBarX11::AddHistoryItemToMenu(HistoryItem* item,
                                             DbusmenuMenuitem* menu,
                                             int tag,
                                             int index) {
   string16 title = item->title;
   std::string url_string = item->url.possibly_invalid_spec();
 
   if (title.empty())
     title = UTF8ToUTF16(url_string);
-  ui::ElideString(title, kMaximumMenuWidthInChars, &title);
+  gfx::ElideString(title, kMaximumMenuWidthInChars, &title);
 
   DbusmenuMenuitem* menu_item = BuildMenuItem(UTF16ToUTF8(title), tag);
   g_signal_connect(menu_item, "item-activated",
                    G_CALLBACK(OnHistoryItemActivatedThunk), this);
 
   g_object_set_data_full(G_OBJECT(menu_item), kHistoryItem, item,
                          DeleteHistoryItem);
   menuitem_child_add_position(menu, menu_item, index);
   g_object_unref(menu_item);
 }
@@ skipping 237 matching lines @@
       tab_restore_service_->LoadTabsFromLastSession();
       tab_restore_service_->AddObserver(this);
 
       // If LoadTabsFromLastSession doesn't load tabs, it won't call
       // TabRestoreServiceChanged(). This ensures that all new windows after
       // the first one will have their menus populated correctly.
       TabRestoreServiceChanged(tab_restore_service_);
     }
   }
 }