summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 11:04:23 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 11:04:23 +0000
commit385bdd415a75f9cdfcbf5612662814bd7136b07b (patch)
tree6dd599b0b295f9764bac025b630bd6615c490da5
parentf3ea1b11d9d84fab8a67a6847b391d8a825f1a87 (diff)
downloadchromium_src-385bdd415a75f9cdfcbf5612662814bd7136b07b.zip
chromium_src-385bdd415a75f9cdfcbf5612662814bd7136b07b.tar.gz
chromium_src-385bdd415a75f9cdfcbf5612662814bd7136b07b.tar.bz2
DevTools: add chrome-devtools to the content settings whitelist.
BUG=103235 Review URL: http://codereview.chromium.org/8565004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109862 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/content_settings_observer.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 24b0db3..a8bdecb 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -36,6 +36,9 @@ static bool IsWhitelistedForContentSettings(WebFrame* frame) {
if (EqualsASCII(origin.protocol(), chrome::kChromeUIScheme))
return true; // Browser UI elements should still work.
+ if (EqualsASCII(origin.protocol(), chrome::kChromeDevToolsScheme))
+ return true; // DevTools UI elements should still work.
+
// If the scheme is ftp: or file:, an empty file name indicates a directory
// listing, which requires JavaScript to function properly.
GURL document_url = frame->document().url();