chrome/browser/guest_view/extension_options/extension_options_guest.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: chrome/browser/guest_view/extension_options/extension_options_guest.cc

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

Patch Set: Address kalman's comments 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/browser/extensions/extension_webui_apitest.cc ('K') | « chrome/browser/extensions/extension_webui_apitest.cc ('k') | chrome/browser/guest_view/guest_view_base.cc » ('j') | chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/extension_options/extension_options_guest.cc

diff --git a/chrome/browser/guest_view/extension_options/extension_options_guest.cc b/chrome/browser/guest_view/extension_options/extension_options_guest.cc

index f41cc801c19d4462eba57ce06dce40c797642f0e..2f64b0e583fd470c6634983d4ddc5182042cd973 100644

--- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc

+++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc

@@ -64,7 +64,9 @@ void ExtensionOptionsGuest::CreateWebContents(

return;

}

- if (extension_id != embedder_extension_id) {

+ if (extensions::Extension::IdIsValid(embedder_extension_id) &&

+ extension_id != embedder_extension_id) {

+ // Extensions cannot embed other extensions' options pages.

callback.Run(NULL);

return;

}