diff options
| author | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 22:27:44 +0000 |
|---|---|---|
| committer | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 22:27:44 +0000 |
| commit | 2c9eafa9469bc77f1a3ecda8af5d6c8b75582b98 (patch) | |
| tree | 6612ba8681e1e339b7e4fd250982b8cb7389c58c | |
| parent | b73a03cdd1b2e8136d5b273de1bd8f3249b43e66 (diff) | |
| download | chromium_src-2c9eafa9469bc77f1a3ecda8af5d6c8b75582b98.zip chromium_src-2c9eafa9469bc77f1a3ecda8af5d6c8b75582b98.tar.gz chromium_src-2c9eafa9469bc77f1a3ecda8af5d6c8b75582b98.tar.bz2 | |
Show full security origin on infobars instead of just hostname.
BUG=344496
Review URL: https://codereview.chromium.org/351683004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279519 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_quota_permission_context.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/geolocation/geolocation_infobar_delegate.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/media/midi_permission_context.cc | 5 |
3 files changed, 18 insertions, 4 deletions
diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 86e6a72..2dbe930 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -96,7 +96,11 @@ base::string16 QuotaPermissionRequest::GetMessageText() const { (requested_quota_ > kRequestLargeQuotaThreshold ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION : IDS_REQUEST_QUOTA_INFOBAR_QUESTION), - net::FormatUrl(origin_url_, display_languages_)); + net::FormatUrl(origin_url_, display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, NULL, NULL, NULL) + ); } base::string16 QuotaPermissionRequest::GetMessageTextFragment() const { @@ -218,7 +222,11 @@ base::string16 RequestQuotaInfoBarDelegate::GetMessageText() const { (requested_quota_ > kRequestLargeQuotaThreshold ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION : IDS_REQUEST_QUOTA_INFOBAR_QUESTION), - net::FormatUrl(origin_url_, display_languages_)); + net::FormatUrl(origin_url_, display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, NULL, NULL, NULL) + ); } bool RequestQuotaInfoBarDelegate::Accept() { diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc index 0ffb663..e7d70e7 100644 --- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc +++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc @@ -145,7 +145,10 @@ bool GeolocationInfoBarDelegate::ShouldExpireInternal( base::string16 GeolocationInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION, - net::FormatUrl(requesting_frame_, display_languages_)); + net::FormatUrl(requesting_frame_, display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, NULL, NULL, NULL)); } base::string16 GeolocationInfoBarDelegate::GetButtonLabel( diff --git a/chrome/browser/media/midi_permission_context.cc b/chrome/browser/media/midi_permission_context.cc index ff606cc..300bfee 100644 --- a/chrome/browser/media/midi_permission_context.cc +++ b/chrome/browser/media/midi_permission_context.cc @@ -83,7 +83,10 @@ int MidiPermissionRequest::GetIconID() const { base::string16 MidiPermissionRequest::GetMessageText() const { return l10n_util::GetStringFUTF16( IDS_MIDI_SYSEX_INFOBAR_QUESTION, - net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_)); + net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, NULL, NULL, NULL)); } base::string16 MidiPermissionRequest::GetMessageTextFragment() const { |