chrome/browser/ui/cocoa/status_bubble_mac.mm - Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.mm

Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 dfa18af1a5871c1d35a5f1bb2fdfef4df320b37e..d7418d97708adfa956884bb39f17072f398f2eba 100644

--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm

+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm

@@ -17,8 +17,8 @@

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

#import "chrome/browser/ui/cocoa/bubble_view.h"

-#include "components/url_formatter/elide_url.h"

-#include "components/url_formatter/url_formatter.h"

+#include "components/secure_display/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"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"

@@ -235,9 +235,9 @@

gfx::FontList font_list_chr(

gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));

- base::string16 original_url_text = url_formatter::FormatUrl(url, languages);

+ base::string16 original_url_text = net::FormatUrl(url, languages);

base::string16 status =

- url_formatter::ElideUrl(url, font_list_chr, text_width, languages);

+ secure_display::ElideUrl(url, font_list_chr, text_width, languages);

SetText(status, true);

@@ -706,7 +706,7 @@

NSFont* font = [[window_ contentView] font];

gfx::FontList font_list_chr(

gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));

- base::string16 expanded_url = url_formatter::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.