components/omnibox/autocomplete_input.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: components/omnibox/autocomplete_input.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

Index: components/omnibox/autocomplete_input.cc

diff --git a/components/omnibox/autocomplete_input.cc b/components/omnibox/autocomplete_input.cc

index a078f8cf411269b6f226f8c4c401ae12a8c95313..6c12a85cb0016be7661745e3fab5bae84b847361 100644

--- a/components/omnibox/autocomplete_input.cc

+++ b/components/omnibox/autocomplete_input.cc

@@ -9,6 +9,7 @@

#include "components/metrics/proto/omnibox_event.pb.h"

#include "components/omnibox/autocomplete_scheme_classifier.h"

#include "components/url_fixer/url_fixer.h"

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

#include "net/base/net_util.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "url/url_canon_ip.h"

@@ -468,7 +469,7 @@ base::string16 AutocompleteInput::FormattedStringWithEquivalentMeaning(

const GURL& url,

const base::string16& formatted_url,

const AutocompleteSchemeClassifier& scheme_classifier) {

- if (!net::CanStripTrailingSlash(url))

+ if (!url_formatter::CanStripTrailingSlash(url))

return formatted_url;

const base::string16 url_with_path(formatted_url + base::char16('/'));

return (AutocompleteInput::Parse(formatted_url, std::string(),

« chrome/browser/autocomplete/history_quick_provider.cc ('K') | « components/omnibox/DEPS ('k') | components/omnibox/search_provider.cc » ('j') | components/url_formatter/DEPS » ('J')