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

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: Fix bad merge 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 7b836d30dd2365afc82fdbdde6f3333f94c64500..c3a17e3ecb9650e4648e12be3f6dc2785cd6567a 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1752,13 +1752,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;

Powered by Google App Engine
This is Rietveld 408576698