chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc - Issue 1171333003: 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/views/bookmarks/bookmark_bar_view.cc

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

Patch Set: Fold in secure_display to url_formatter Created 5 years, 5 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/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e5336afcabc0057d39330d6e33e8d2260db76e43..6222ee37128c62d0b550fc2b01303be4d8ebc2e7 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -55,7 +55,7 @@

#include "components/bookmarks/browser/bookmark_utils.h"

#include "components/bookmarks/managed/managed_bookmark_service.h"

#include "components/metrics/metrics_service.h"

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

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

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/page_navigator.h"

@@ -722,7 +722,7 @@ base::string16 BookmarkBarView::CreateToolTipForURLAndTitle(

std::string languages = profile->GetPrefs()->GetString(

prefs::kAcceptLanguages);

base::string16 elided_url(

- secure_display::ElideUrl(url, tt_fonts, max_width, languages));

+ url_formatter::ElideUrl(url, tt_fonts, max_width, languages));

elided_url = base::i18n::GetDisplayStringInLTRDirectionality(elided_url);

result.append(elided_url);

}