chrome/browser/android/omnibox/autocomplete_controller_android.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/android/omnibox/autocomplete_controller_android.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/android/fullscreen/fullscreen_infobar_delegate.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc

diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc

index fdea013ff9b00729451374458ea69c679dd6c916..fdf4887c22766a32ab02bb29169b6e057e2744b2 100644

--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc

+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc

@@ -42,6 +42,7 @@

#include "components/omnibox/browser/search_provider.h"

#include "components/search/search.h"

#include "components/search_engines/template_url_service.h"

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

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

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

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

@@ -49,7 +50,6 @@

#include "content/public/common/url_constants.h"

#include "jni/AutocompleteController_jni.h"

#include "net/base/escape.h"

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

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

using base::android::AttachCurrentThread;

@@ -475,8 +475,9 @@ base::string16 AutocompleteControllerAndroid::FormatURLUsingAcceptLanguages(

std::string languages(

profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));

- return net::FormatUrl(url, languages, net::kFormatUrlOmitAll,

- net::UnescapeRule::SPACES, NULL, NULL, NULL);

+ return url_formatter::FormatUrl(

+ url, languages, url_formatter::kFormatUrlOmitAll,

+ net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);

}

ScopedJavaLocalRef<jobject>

« no previous file with comments | « chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | components/url_formatter/DEPS » ('J')