| Index: chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| index 30998386884b8ddef963a023017953af966b7cb7..e8ffe66d0af49ab39c3df32bd4c94a29fad41c99 100644
|
| --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| @@ -17,7 +17,6 @@
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #import "chrome/browser/ui/cocoa/bubble_view.h"
|
| -#include "chrome/browser/ui/elide_url.h"
|
| #include "net/base/net_util.h"
|
| #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
|
| #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h"
|
| @@ -27,6 +26,7 @@
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/gfx/text_elider.h"
|
| #include "ui/gfx/text_utils.h"
|
| +#include "ui/secure_display/elide_url.h"
|
|
|
| namespace {
|
|
|
| @@ -236,7 +236,7 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
|
|
|
| base::string16 original_url_text = net::FormatUrl(url, languages);
|
| base::string16 status =
|
| - ElideUrl(url, font_list_chr, text_width, languages);
|
| + secure_display::ElideUrl(url, font_list_chr, text_width, languages);
|
|
|
| SetText(status, true);
|
|
|
| @@ -705,7 +705,7 @@ void StatusBubbleMac::ExpandBubble() {
|
| NSFont* font = [[window_ contentView] font];
|
| gfx::FontList font_list_chr(
|
| gfx::Font(base::SysNSStringToUTF8([font fontName]), [font pointSize]));
|
| - base::string16 expanded_url = ElideUrl(
|
| + base::string16 expanded_url = secure_display::ElideUrl(
|
| url_, font_list_chr, max_bubble_width, languages_);
|
|
|
| // Scale width from gfx::Font in view coordinates to window coordinates.
|
|
|