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 6f7dbb145a867813ddf1e69127c84a2d0917355b..b16b6682d80e5e8a0ad110f8fda478973c7602ce 100644 |
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
@@ -21,7 +21,6 @@ |
#include "chrome/browser/ui/browser_navigator.h" |
#include "chrome/browser/ui/collected_cookies_infobar_delegate.h" |
#include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h" |
-#include "chrome/browser/ui/elide_url.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/render_messages.h" |
@@ -30,6 +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/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 @@ bool ContentSettingSingleRadioGroup::settings_changed() const { |
// content type and setting the default value based on the content setting. |
void ContentSettingSingleRadioGroup::SetRadioGroup() { |
GURL url = web_contents()->GetURL(); |
- base::string16 display_host = FormatUrlForSecurityDisplay( |
+ base::string16 display_host = secure_display::FormatUrlForSecurityDisplay( |
url, profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
if (display_host.empty()) |
display_host = base::ASCIIToUTF16(url.spec()); |
@@ -677,8 +677,9 @@ void ContentSettingMediaStreamBubbleModel::SetRadioGroup() { |
RadioGroup radio_group; |
radio_group.url = url; |
- base::string16 display_host_utf16 = FormatUrlForSecurityDisplay( |
- url, profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
+ base::string16 display_host_utf16 = |
+ secure_display::FormatUrlForSecurityDisplay( |
+ url, profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
std::string display_host(base::UTF16ToUTF8(display_host_utf16)); |
if (display_host.empty()) |
display_host = url.spec(); |