Chromium Code Reviews| Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm |
| index adf8e17fe63225bae01d16570cab452ee81fe93d..a7522922add2a5bd695855746e3d9926b75cd67c 100644 |
| --- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm |
| +++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm |
| @@ -36,6 +36,7 @@ |
| #include "components/prefs/pref_service.h" |
| #include "components/strings/grit/components_strings.h" |
| #include "components/url_formatter/elide_url.h" |
| +#include "components/url_formatter/url_formatter.h" |
| #include "content/public/browser/native_web_keyboard_event.h" |
| #include "content/public/browser/user_metrics.h" |
| #include "skia/ext/skia_utils_mac.h" |
| @@ -553,11 +554,12 @@ const NSInteger kFullscreenLeftOffset = 40; |
| [titleView setBezeled:NO]; |
| [titleView setEditable:NO]; |
| [titleView setSelectable:NO]; |
| + base::string16 displayUrl = url_formatter::FormatUrlForSecurityDisplay( |
| + origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC); |
| + if (base::IsStringASCII(displayUrl)) |
|
jungshik at Google
2016/09/27 17:58:00
Here does the url have any query or path part or i
|
| + displayUrl = url_formatter::IDNToUnicode(base::UTF16ToASCII(displayUrl)); |
| [titleView setStringValue:l10n_util::GetNSStringF( |
| - IDS_PERMISSIONS_BUBBLE_PROMPT, |
| - url_formatter::FormatUrlForSecurityDisplay( |
| - origin, url_formatter::SchemeDisplay:: |
| - OMIT_CRYPTOGRAPHIC))]; |
| + IDS_PERMISSIONS_BUBBLE_PROMPT, displayUrl)]; |
| [titleView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; |
| [titleView sizeToFit]; |
| NSRect titleFrame = [titleView frame]; |