Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc |
=================================================================== |
--- chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (revision 71854) |
+++ chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (working copy) |
@@ -4,11 +4,8 @@ |
#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" |
-#include "app/bidi_line_iterator.h" |
#include "app/l10n_util.h" |
#include "app/resource_bundle.h" |
-#include "app/text_elider.h" |
-#include "app/theme_provider.h" |
#include "base/compiler_specific.h" |
#include "base/i18n/rtl.h" |
#include "base/utf_string_conversions.h" |
@@ -28,6 +25,9 @@ |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "third_party/skia/include/core/SkShader.h" |
+#include "ui/base/text/bidi_line_iterator.h" |
+#include "ui/base/text/text_elider.h" |
+#include "ui/base/theme_provider.h" |
#include "unicode/ubidi.h" |
#include "views/controls/button/text_button.h" |
#include "views/controls/label.h" |
@@ -558,7 +558,7 @@ |
// worry about whether our eliding might change the visual display in |
// unintended ways, e.g. by removing directional markings or by adding an |
// ellipsis that's not enclosed in appropriate markings. |
- BiDiLineIterator bidi_line; |
+ ui::BiDiLineIterator bidi_line; |
if (!bidi_line.Open(WideToUTF16Hack(text), base::i18n::IsRTL(), is_url)) |
return x; |
const int num_runs = bidi_line.CountRuns(); |
@@ -711,8 +711,8 @@ |
// Can we fit at least an ellipsis? |
std::wstring elided_text(UTF16ToWideHack( |
- gfx::ElideText(WideToUTF16Hack(j->text), *j->font, remaining_width, |
- false))); |
+ ui::ElideText(WideToUTF16Hack(j->text), *j->font, remaining_width, |
+ false))); |
Classifications::reverse_iterator prior_classification(j); |
++prior_classification; |
const bool on_first_classification = |