Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
index 771df718d2eb44677df46a7442adf51791f6a731..20ad0e3889bef3b80db79f243a0263c14d058a73 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
@@ -35,7 +35,6 @@ |
#include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/chrome_pages.h" |
-#include "chrome/browser/ui/elide_url.h" |
#include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
#include "chrome/browser/ui/omnibox/omnibox_view.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
@@ -81,6 +80,7 @@ |
#include "ui/gfx/text_constants.h" |
#include "ui/gfx/text_elider.h" |
#include "ui/resources/grit/ui_resources.h" |
+#include "ui/secure_display/elide_url.h" |
#include "ui/views/button_drag_utils.h" |
#include "ui/views/controls/button/label_button.h" |
#include "ui/views/controls/button/label_button_border.h" |
@@ -721,7 +721,8 @@ base::string16 BookmarkBarView::CreateToolTipForURLAndTitle( |
// default. |
std::string languages = profile->GetPrefs()->GetString( |
prefs::kAcceptLanguages); |
- base::string16 elided_url(ElideUrl(url, tt_fonts, max_width, languages)); |
+ base::string16 elided_url( |
+ secure_display::ElideUrl(url, tt_fonts, max_width, languages)); |
elided_url = base::i18n::GetDisplayStringInLTRDirectionality(elided_url); |
result.append(elided_url); |
} |