chrome/common/extensions/extension.cc - Issue 10332071: Pass command line arguments onto platform apps which provide the right intent.

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/extension.cc

Issue 10332071: Pass command line arguments onto platform apps which provide the right intent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Windows tests fixed Created 8 years, 7 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/common/extensions/api/experimental_app.json ('k') | chrome/renderer/extensions/experimental.app_custom_bindings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index bd79d1c263d3dd9b25379ca5dc3d715858bfed5d..477764fa0a4c9f8fac09ca6130f22c237b49aa8f 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -1790,13 +1790,13 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,

if (href.empty()) {

if (is_hosted_app()) {

href = launch_web_url();

- } else if (is_packaged_app() || is_platform_app()) {

+ } else if (is_packaged_app()) {

href = launch_local_path();

}

// If we still don't have an href, the manifest is malformed.

- if (href.empty()) {

+ if (href.empty() && !is_platform_app()) {

*error = ExtensionErrorUtils::FormatErrorMessageUTF16(

errors::kInvalidIntentHrefEmpty, action_name);

return false;

@@ -1812,7 +1812,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,

return false;

}

service.service_url = service_url;

- } else {

+ } else if (!is_platform_app()) {

// We do not allow absolute intent URLs in non-hosted apps.

if (service_url.is_valid()) {

*error = ExtensionErrorUtils::FormatErrorMessageUTF16(