chrome/browser/ui/views/status_bubble_views.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/status_bubble_views.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: Compile fixes following rebase Created 5 years, 6 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

« chrome/browser/autocomplete/history_quick_provider.cc ('K') | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/website_settings/permissions_bubble_view.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a6ca0372db3d154b63f7f68737fd351a4dcb0f30..4b5a528d32bf9c5fe5a93bb56189cc25e7fa9dda 100644

--- a/chrome/browser/ui/views/status_bubble_views.cc

+++ b/chrome/browser/ui/views/status_bubble_views.cc

@@ -13,7 +13,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/themes/theme_properties.h"

#include "chrome/browser/ui/elide_url.h"

-#include "net/base/net_util.h"

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

#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/core/SkRect.h"

#include "ui/base/theme_provider.h"

@@ -698,7 +698,8 @@ void StatusBubbleViews::SetURL(const GURL& url, const std::string& languages) {

// size (shrinking or expanding). Otherwise delay.

if (is_expanded_ && !url.is_empty()) {

ExpandBubble();

- } else if (net::FormatUrl(url, languages).length() > url_text_.length()) {

+ } else if (url_formatter::FormatUrl(url, languages).length() >

+ url_text_.length()) {

base::MessageLoop::current()->PostDelayedTask(

FROM_HERE,

base::Bind(&StatusBubbleViews::ExpandBubble,