summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:06:32 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:06:32 +0000
commitead9009eade6fad2e5cad5b3ecc9ff8d432eddd8 (patch)
tree3aea64118b2bf852e073e8a66635a100fa844fad /chrome/browser/content_settings
parentfc0a0006999cdc55032053772c55f99d9a58b768 (diff)
downloadchromium_src-ead9009eade6fad2e5cad5b3ecc9ff8d432eddd8.zip
chromium_src-ead9009eade6fad2e5cad5b3ecc9ff8d432eddd8.tar.gz
chromium_src-ead9009eade6fad2e5cad5b3ecc9ff8d432eddd8.tar.bz2
When starting a provisional load, indicate whether the provisional URL is about:srcdoc
This corresponds to an iframe loading the document given in its srcdoc attribute BUG=143337 R=creis@chromium.org Review URL: https://chromiumcodereview.appspot.com/11788015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
-rw-r--r--chrome/browser/content_settings/tab_specific_content_settings.cc1
-rw-r--r--chrome/browser/content_settings/tab_specific_content_settings.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 82dd4df..9f69246 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -499,6 +499,7 @@ void TabSpecificContentSettings::DidStartProvisionalLoadForFrame(
bool is_main_frame,
const GURL& validated_url,
bool is_error_page,
+ bool is_iframe_srcdoc,
RenderViewHost* render_view_host) {
if (!is_main_frame)
return;
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 1ab21f8..3ba7f4f 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -243,6 +243,7 @@ class TabSpecificContentSettings
bool is_main_frame,
const GURL& validated_url,
bool is_error_page,
+ bool is_iframe_srcdoc,
content::RenderViewHost* render_view_host) OVERRIDE;
virtual void AppCacheAccessed(const GURL& manifest_url,
bool blocked_by_policy) OVERRIDE;