| Index: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/content_setting_bubble_gtk.cc (revision 71854)
|
| +++ chrome/browser/ui/gtk/content_setting_bubble_gtk.cc (working copy)
|
| @@ -9,7 +9,6 @@
|
| #include <vector>
|
|
|
| #include "app/l10n_util.h"
|
| -#include "app/text_elider.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/blocked_content_container.h"
|
| @@ -27,6 +26,7 @@
|
| #include "gfx/gtk_util.h"
|
| #include "grit/app_resources.h"
|
| #include "grit/generated_resources.h"
|
| +#include "ui/base/text/text_elider.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
|
|
| namespace {
|
| @@ -39,7 +39,7 @@
|
| const int kMaxLinkPixelSize = 500;
|
|
|
| std::string BuildElidedText(const std::string& input) {
|
| - return UTF16ToUTF8(gfx::ElideText(
|
| + return UTF16ToUTF8(ui::ElideText(
|
| UTF8ToUTF16(input),
|
| gfx::Font(),
|
| kMaxLinkPixelSize,
|
|
|