chrome/browser/extensions/extension_tab_util.cc - 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/extensions/extension_tab_util.cc

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/extensions/api/settings_private/prefs_util.cc ('k') | chrome/browser/geolocation/geolocation_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tab_util.cc

diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc

index 45eb61f3182b36bb06c605f9302072776dcbad04..6ac0c78efe3740fb9ac52a4f370b64044abaaadd 100644

--- a/chrome/browser/extensions/extension_tab_util.cc

+++ b/chrome/browser/extensions/extension_tab_util.cc

@@ -25,7 +25,7 @@

#include "chrome/browser/ui/tabs/tab_utils.h"

#include "chrome/common/extensions/api/tabs.h"

#include "chrome/common/url_constants.h"

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

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

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

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

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

@@ -550,7 +550,7 @@

// Check a fixed-up URL, to normalize the scheme and parse hosts correctly.

GURL fixed_url =

- url_formatter::FixupURL(url.possibly_invalid_spec(), std::string());

+ url_fixer::FixupURL(url.possibly_invalid_spec(), std::string());

if (!fixed_url.SchemeIs(content::kChromeUIScheme))

return false;