chrome/browser/ui/website_settings/website_settings.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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/website_settings/website_settings.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typo in elide_url.cc Created 4 years, 8 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/views/website_settings/permissions_bubble_view.cc ('k') | chrome/browser/ui/webui/browsing_history_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 4246c2da3c4bc06a26d19d931ca60ac8860f70ff..e74b86bb90fbcbc229da83dd6501319304a4ba7c 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -41,7 +41,6 @@

#include "chrome/browser/usb/usb_chooser_context_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/features.h"

-#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

@@ -186,11 +185,8 @@ WebsiteSettings::SiteIdentityStatus GetSiteIdentityStatusByCTInfo(

return WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR;

}

-base::string16 GetSimpleSiteName(const GURL& url, Profile* profile) {

- std::string languages;

- if (profile)

- languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

- return url_formatter::FormatUrlForSecurityDisplayOmitScheme(url, languages);

+base::string16 GetSimpleSiteName(const GURL& url) {

+ return url_formatter::FormatUrlForSecurityDisplayOmitScheme(url);

}

ChooserContextBase* GetUsbChooserContext(Profile* profile) {

@@ -523,7 +519,7 @@ void WebsiteSettings::Init(

// weakly encrypted connections.

site_connection_status_ = SITE_CONNECTION_STATUS_UNKNOWN;

- base::string16 subject_name(GetSimpleSiteName(url, profile_));

+ base::string16 subject_name(GetSimpleSiteName(url));

if (subject_name.empty()) {

subject_name.assign(

l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));

@@ -759,7 +755,7 @@ void WebsiteSettings::PresentSiteIdentity() {

if (site_identity_status_ == SITE_IDENTITY_STATUS_EV_CERT)

info.site_identity = UTF16ToUTF8(organization_name());

else

- info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_, profile_));

+ info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_));

info.connection_status = site_connection_status_;

info.connection_status_description =