chrome/common/extensions/manifest_handlers/app_launch_info.cc - Issue 142993002: Remove unused members from WebApplicationInfo.

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/common/extensions/manifest_handlers/app_launch_info.cc

Issue 142993002: Remove unused members from WebApplicationInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 11 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:

Index: chrome/common/extensions/manifest_handlers/app_launch_info.cc

diff --git a/chrome/common/extensions/manifest_handlers/app_launch_info.cc b/chrome/common/extensions/manifest_handlers/app_launch_info.cc

index a3b3ac592ec71d3c5f689684d6e9aa0838d37d78..0d1530f10a3bd85e5c10314b1f21c81547b586b0 100644

--- a/chrome/common/extensions/manifest_handlers/app_launch_info.cc

+++ b/chrome/common/extensions/manifest_handlers/app_launch_info.cc

@@ -177,7 +177,10 @@ bool AppLaunchInfo::LoadLaunchURL(Extension* extension, base::string16* error) {

}

// If there is no extent, we default the extent based on the launch URL.

- if (extension->web_extent().is_empty() && !launch_web_url_.is_empty()) {

+ // Bookmark apps are permissionless and shouldn't be restricted by overlapping

+ // extents.

benwells 2014/01/21 22:42:13 Isn't this from another change, and no longer need

calamity 2014/01/24 06:06:13 My bad, branch management. Removed.

+ if (extension->web_extent().is_empty() && !launch_web_url_.is_empty() &&

+ !extension->from_bookmark()) {

URLPattern pattern(Extension::kValidWebExtentSchemes);

if (!pattern.SetScheme("*")) {

*error = ErrorUtils::FormatErrorMessageUTF16(

« no previous file with comments | « chrome/common/extensions/extension_messages.h ('k') | chrome/common/web_application_info.h » ('j') | no next file with comments »