Move text_elider to gfx.

chrome/browser/ui/gtk/content_setting_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/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/text_elider.h"
 
 using content::PluginService;
 using content::WebContents;
 
 namespace {
 
 // The maximum width of a title entry in the content box. We elide anything
 // longer than this.
 const int kMaxLinkPixelSize = 500;
 
 // The minimum and maximum width of the media menu buttons.
 const int kMinMediaMenuButtonWidth = 100;
 const int kMaxMediaMenuButtonWidth = 600;
 
 std::string BuildElidedText(const std::string& input) {
-  return UTF16ToUTF8(ui::ElideText(
+  return UTF16ToUTF8(gfx::ElideText(
       UTF8ToUTF16(input),
       gfx::Font(),
       kMaxLinkPixelSize,
-      ui::ELIDE_AT_END));
+      gfx::ELIDE_AT_END));
 }
 
 }  // namespace
 
 ContentSettingBubbleGtk::ContentSettingBubbleGtk(
     GtkWidget* anchor,
     BubbleDelegateGtk* delegate,
     ContentSettingBubbleModel* content_setting_bubble_model,
     Profile* profile,
     WebContents* web_contents)
@@ skipping 349 matching lines @@
   GtkMediaMenuMap::iterator i(media_menus_.find(button));
   DCHECK(i != media_menus_.end());
   i->second->menu->PopupForWidget(button, 1, gtk_get_current_event_time());
 }
 
 ContentSettingBubbleGtk::MediaMenuGtk::MediaMenuGtk(
     content::MediaStreamType type)
     : type(type) {}
 
 ContentSettingBubbleGtk::MediaMenuGtk::~MediaMenuGtk() {}