Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6066)

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: Add left brace 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
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 6d89f6fcf85c57914a6af70b78cf0fea7629ea0b..f7ca2908f72de01663b09ff9edfdecbc4ea2d6c1 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;
}
« no previous file with comments | « chrome/browser/extensions/extension_webui_apitest.cc ('k') | chrome/browser/ui/webui/extensions/extensions_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698