content/browser/webui/web_ui_data_source_impl.cc - Issue 453613002: Implement support for <extensionoptions> embedding in WebUI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/webui/web_ui_data_source_impl.cc

Issue 453613002: Implement support for <extensionoptions> embedding in WebUI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/test/data/extensions/webui/can_embed_extension_options.js ('K') | « chrome/test/data/extensions/webui/can_embed_extension_options.js ('k') | extensions/renderer/event_bindings.cc » ('j') | extensions/renderer/event_bindings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/webui/web_ui_data_source_impl.cc

diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc

index 8b479a87e6c5690180e9673d24528d4596a52a4b..e112b1170fb8b8ad7db588afab9ed3ee4d293b9c 100644

--- a/content/browser/webui/web_ui_data_source_impl.cc

+++ b/content/browser/webui/web_ui_data_source_impl.cc

@@ -89,7 +89,7 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource {

virtual std::string GetContentSecurityPolicyObjectSrc() const OVERRIDE {

if (parent_->object_src_set_)

return parent_->object_src_;

- return URLDataSource::GetContentSecurityPolicyObjectSrc();

+ return "object-src chrome://chrome/extensions/ chrome://extensions-frame/;";

not at google - send to devlin 2014/08/07 23:06:03 you must get somebody else to look at this. I can'

ericzeng 2014/08/08 00:23:47 Acknowledged.

}

virtual std::string GetContentSecurityPolicyFrameSrc() const OVERRIDE {

if (parent_->frame_src_set_)