summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_setting_bubble_model.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 10:03:07 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 10:03:07 +0000
commit0d146bf5d1b7302156e986970125dc98ae7a3d28 (patch)
tree676c7e41784fe3b0fd4a8a3c2c23b28a92b3d065 /chrome/browser/content_setting_bubble_model.cc
parentc3eb467660b82675bd69a3f59241e9083bab8edb (diff)
downloadchromium_src-0d146bf5d1b7302156e986970125dc98ae7a3d28.zip
chromium_src-0d146bf5d1b7302156e986970125dc98ae7a3d28.tar.gz
chromium_src-0d146bf5d1b7302156e986970125dc98ae7a3d28.tar.bz2
If host part of an URL cannot be parsed, use the spec in content bubbles
BUG=64374 TEST=as described in bug Review URL: http://codereview.chromium.org/6529023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_bubble_model.cc')
-rw-r--r--chrome/browser/content_setting_bubble_model.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc
index c2f058c..8a4c6b6 100644
--- a/chrome/browser/content_setting_bubble_model.cc
+++ b/chrome/browser/content_setting_bubble_model.cc
@@ -197,6 +197,9 @@ class ContentSettingSingleRadioGroup
&display_host_wide, NULL, NULL);
std::string display_host(WideToUTF8(display_host_wide));
+ if (display_host.empty())
+ display_host = url.spec();
+
const std::set<std::string>& resources =
bubble_content().resource_identifiers;