Index: chrome/browser/ui/views/omnibox/omnibox_result_view.cc |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc |
index fe2225ff7ce3b4ea45a2fb818a2f846aff105f47..8afee9338ceb3a2bee36508f1314f60c641cdae5 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc |
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc |
@@ -21,12 +21,12 @@ |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
-#include "ui/base/text/text_elider.h" |
#include "ui/base/theme_provider.h" |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/color_utils.h" |
#include "ui/gfx/image/image.h" |
#include "ui/gfx/render_text.h" |
+#include "ui/gfx/text_elider.h" |
#include "ui/native_theme/native_theme.h" |
#if defined(OS_WIN) |
@@ -517,7 +517,7 @@ void OmniboxResultView::Elide(Runs* runs, int remaining_width) const { |
(*j)->GetPrimaryFont().DeriveFont(0, gfx::Font::BOLD) : |
(*j)->GetPrimaryFont()); |
string16 elided_text( |
- ui::ElideText((*j)->text(), font, remaining_width, ui::ELIDE_AT_END)); |
+ gfx::ElideText((*j)->text(), font, remaining_width, gfx::ELIDE_AT_END)); |
Classifications::reverse_iterator prior(j + 1); |
const bool on_first_classification = (prior == i->classifications.rend()); |
if (elided_text.empty() && (remaining_width >= ellipsis_width_) && |