Index: chrome/browser/ui/views/status_bubble_views.cc |
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc |
index 2623edcb9c8687d9bf29b94c98f665d0f01de991..92e4012b5c7395f5479ae6ed1b936b0cb75a5dfb 100644 |
--- a/chrome/browser/ui/views/status_bubble_views.cc |
+++ b/chrome/browser/ui/views/status_bubble_views.cc |
@@ -14,7 +14,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/thread_task_runner_handle.h" |
#include "chrome/browser/themes/theme_properties.h" |
-#include "chrome/browser/ui/elide_url.h" |
+#include "components/secure_display/elide_url.h" |
#include "net/base/net_util.h" |
#include "third_party/skia/include/core/SkPaint.h" |
#include "third_party/skia/include/core/SkRect.h" |
@@ -694,7 +694,8 @@ void StatusBubbleViews::SetURL(const GURL& url, const std::string& languages) { |
gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen(); |
int text_width = static_cast<int>(popup_bounds.width() - |
(kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1); |
- url_text_ = ElideUrl(url, gfx::FontList(), text_width, languages); |
+ url_text_ = |
+ secure_display::ElideUrl(url, gfx::FontList(), text_width, languages); |
// An URL is always treated as a left-to-right string. On right-to-left UIs |
// we need to explicitly mark the URL as LTR to make sure it is displayed |
@@ -857,7 +858,8 @@ void StatusBubbleViews::ExpandBubble() { |
gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen(); |
int max_status_bubble_width = GetMaxStatusBubbleWidth(); |
const gfx::FontList font_list; |
- url_text_ = ElideUrl(url_, font_list, max_status_bubble_width, languages_); |
+ url_text_ = secure_display::ElideUrl(url_, font_list, max_status_bubble_width, |
+ languages_); |
int expanded_bubble_width = |
std::max(GetStandardStatusBubbleWidth(), |
std::min(gfx::GetStringWidth(url_text_, font_list) + |