Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7540)

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: Compile fixed, postResult added 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
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index b541a154bc47c74d9c61a129b160b7bd3872a8af..02d4940fcc5b97db52647e5826087082e9a5e7be 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1761,13 +1761,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;
@@ -1783,7 +1783,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(

Powered by Google App Engine
This is Rietveld 408576698