chrome/browser/guest_view/guest_view_base.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/guest_view_base.cc

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

Patch Set: Fix object-src CSP override 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 | « chrome/browser/extensions/extension_webui_apitest.cc ('k') | chrome/browser/ui/webui/extensions/extensions_ui.cc » ('j') | chrome/browser/ui/webui/extensions/extensions_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/guest_view_base.cc

diff --git a/chrome/browser/guest_view/guest_view_base.cc b/chrome/browser/guest_view/guest_view_base.cc

index 1300cfbb50d4b30240729963b6c2ff87dfcf8b4a..0c0480fa7fad2babc06ba90cefc24b832a30878f 100644

--- a/chrome/browser/guest_view/guest_view_base.cc

+++ b/chrome/browser/guest_view/guest_view_base.cc

@@ -106,9 +106,11 @@ void GuestViewBase::Init(

return;

initialized_ = true;

- if (!CanEmbedderUseGuestView(embedder_extension_id)) {

- callback.Run(NULL);

- return;

+ if (!embedder_extension_id.empty()) {

+ if (!CanEmbedderUseGuestView(embedder_extension_id)) {

+ callback.Run(NULL);

+ return;

+ }

}

CreateWebContents(embedder_extension_id,

@@ -389,10 +391,6 @@ GuestViewBase::~GuestViewBase() {

void GuestViewBase::DispatchEventToEmbedder(Event* event) {

scoped_ptr<Event> event_ptr(event);

- if (!in_extension()) {

- NOTREACHED();

- return;

- }

if (!attached()) {

pending_events_.push_back(linked_ptr<Event>(event_ptr.release()));