chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.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/ui/cocoa/toolbar/toolbar_controller.mm ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 0a03d05ad5f14ab38aa8f247ab791d484620f641..339c59664f20f9e0c525f99c15e266e45f0bfd38 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -29,7 +29,7 @@

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

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

#include "components/content_settings/core/common/content_settings.h"

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

+#include "components/secure_display/elide_url.h"

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

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

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

@@ -275,7 +275,7 @@

// content type and setting the default value based on the content setting.

void ContentSettingSingleRadioGroup::SetRadioGroup() {

GURL url = web_contents()->GetURL();

- base::string16 display_host = url_formatter::FormatUrlForSecurityDisplay(

+ base::string16 display_host = secure_display::FormatUrlForSecurityDisplay(

url, profile()->GetPrefs()->GetString(prefs::kAcceptLanguages));

if (display_host.empty())

display_host = base::ASCIIToUTF16(url.spec());

@@ -719,7 +719,7 @@

radio_group.url = url;

base::string16 display_host_utf16 =

- url_formatter::FormatUrlForSecurityDisplay(

+ secure_display::FormatUrlForSecurityDisplay(

url, profile()->GetPrefs()->GetString(prefs::kAcceptLanguages));

std::string display_host(base::UTF16ToUTF8(display_host_utf16));

if (display_host.empty())