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

Unified Diff: chrome/browser/extensions/api/guest_view/guest_view_internal_api.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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_webui_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
diff --git a/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc b/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
index 0e898a49a3ab8168de7916394bb02e447ab85941..caaadbb798610b4a457a2be7d6004529b91645ac 100644
--- a/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
+++ b/chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc
@@ -40,9 +40,15 @@ bool GuestViewInternalCreateGuestFunction::RunAsync() {
error_ = "Guest views can only be embedded in web content";
return false;
}
+ // If the guest is an <extensionoptions> to be embedded in a WebUI, then
+ // there is no extension, and extension() will be null. Use an empty string
+ // instead.
+ std::string embedder_extension_id;
+ if (extension())
+ embedder_extension_id = extension_id();
guest_view_manager->CreateGuest(view_type,
- extension_id(),
+ embedder_extension_id,
embedder_web_contents,
*create_params,
callback);
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_webui_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698