components/content_settings/core/browser/content_settings_usages_state.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/content_settings/core/browser/content_settings_usages_state.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') | « components/content_settings/core/browser/DEPS ('k') | components/error_page.gypi » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_usages_state.cc

diff --git a/components/content_settings/core/browser/content_settings_usages_state.cc b/components/content_settings/core/browser/content_settings_usages_state.cc

index 89b938c50766cf566046a577b6089323bc0a40ae..81132603616a707b38b654471c34f64d192d496d 100644

--- a/components/content_settings/core/browser/content_settings_usages_state.cc

+++ b/components/content_settings/core/browser/content_settings_usages_state.cc

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

#include "base/prefs/pref_service.h"

#include "base/strings/utf_string_conversions.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

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

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

ContentSettingsUsagesState::CommittedDetails::CommittedDetails()

: current_url_valid(false) {

@@ -106,7 +106,7 @@ void ContentSettingsUsagesState::GetDetailedInfo(

std::string ContentSettingsUsagesState::GURLToFormattedHost(

const GURL& url) const {

base::string16 display_host;

- net::AppendFormattedHost(url, pref_service_->GetString(accept_language_pref_),

- &display_host);

+ url_formatter::AppendFormattedHost(

+ url, pref_service_->GetString(accept_language_pref_), &display_host);

return base::UTF16ToUTF8(display_host);

}

« chrome/browser/autocomplete/history_quick_provider.cc ('K') | « components/content_settings/core/browser/DEPS ('k') | components/error_page.gypi » ('j') | components/url_formatter/DEPS » ('J')