| 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);
|
|
|