chrome/browser/guest_view/extension_options/extension_options_guest.cc - Issue 429763002: Implement createfailed event for <extensionoptions>

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 429763002: Implement createfailed event for <extensionoptions> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove self hack 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/guest_view/extension_options/extension_options_apitest.cc ('k') | chrome/renderer/resources/extensions/extension_options.js » ('j') | no next file with comments »
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 d4b3e8b589fb75546cf57c1631ed5944ffdafed8..8fd477aa9ea7bc57494200fb723fb49044cdf952 100644

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

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

@@ -66,11 +66,16 @@ void ExtensionOptionsGuest::CreateWebContents(

// Get the extension's base URL.

std::string extension_id;

create_params.GetString(extensionoptions::kExtensionId, &extension_id);

- if (extension_id.empty()) {

+ if (!extensions::Extension::IdIsValid(extension_id)) {

+ callback.Run(NULL);

+ return;

+ }

+ if (extension_id != embedder_extension_id) {

callback.Run(NULL);

return;

}

- DCHECK(extensions::Extension::IdIsValid(extension_id));

GURL extension_url =

extensions::Extension::GetBaseURLFromExtensionId(extension_id);