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

Unified Diff: chrome/renderer/resources/extensions/app_runtime_custom_bindings.js

Issue 12223086: Update app runtime custom bindings to handle no WebIntents launch data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More stuff removed Created 7 years, 10 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/renderer/resources/extensions/app_runtime_custom_bindings.js
diff --git a/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js b/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js
index 80e6c520df9649194cab24bc6be9dd60de59f6cc..0a70fc4cb302137841d32d3ffdc2920c5ec6f587 100644
--- a/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js
@@ -15,8 +15,6 @@ var CreateBlob = appNatives.CreateBlob;
chromeHidden.Event.registerArgumentMassager('app.runtime.onLaunched',
function(args, dispatch) {
var launchData = args[0];
- var intentData = args[1];
- var intentId = args[2];
if (launchData && typeof launchData.id !== 'undefined') {
// new-style dispatch.
@@ -33,14 +31,6 @@ chromeHidden.Event.registerArgumentMassager('app.runtime.onLaunched',
dispatch([]);
} else {
var data = { id: launchData.id, items: items };
- // TODO(benwells): remove once we no longer support intents.
- data.intent = {
- action: "http://webintents.org/view",
- type: "chrome-extension://fileentry",
- data: items[0].entry,
- postResult: function() {},
- postFailure: function() {}
- };
dispatch([data]);
}
}
@@ -53,67 +43,9 @@ chromeHidden.Event.registerArgumentMassager('app.runtime.onLaunched',
itemLoaded(fileError);
});
});
+ } else if (launchData) {
+ dispatch([launchData]);
} else {
- if (launchData) {
- if (intentId) {
- var fn = function(success, data) {
- chrome.app.runtime.postIntentResponse({
- 'intentId': intentId,
- 'success': success,
- 'data': SerializeToString(data)
- });
- };
- launchData.intent.postResult = fn.bind(undefined, true);
- launchData.intent.postFailure = fn.bind(undefined, false);
- } else {
- launchData.intent.postResult = function() {};
- launchData.intent.postFailure = function() {};
- }
- }
-
- if (launchData && intentData) {
- switch(intentData.format) {
- case('fileEntry'):
- var fs = GetIsolatedFileSystem(intentData.fileSystemId);
- try {
- fs.root.getFile(intentData.baseName, {}, function(fileEntry) {
- launchData.intent.data = fileEntry;
- dispatch([launchData]);
- }, function(fileError) {
- console.error('Error getting fileEntry, code: ' + fileError.code);
- dispatch([]);
- });
- } catch (e) {
- console.error('Error in event handler for onLaunched: ' + e.stack);
- dispatch([]);
- }
- break;
- case('filesystem'):
- launchData.intent.data = GetIsolatedFileSystem(
- intentData.fileSystemId, intentData.baseName);
- launchData.intent.postResult = function() {};
- launchData.intent.postFailure = function() {};
- dispatch([launchData]);
- break;
- case('serialized'):
- var deserializedData = DeserializeString(intentData.data);
- launchData.intent.data = deserializedData;
- dispatch([launchData]);
- break;
- case('blob'):
- var blobData = CreateBlob(intentData.blobFilePath,
- intentData.blobLength);
- launchData.intent.data = blobData;
- dispatch([launchData]);
- break;
- default:
- console.error('Unexpected launch data format');
- dispatch([]);
- }
- } else if (launchData) {
- dispatch([launchData]);
- } else {
- dispatch([]);
- }
+ dispatch([]);
}
});

Powered by Google App Engine
This is Rietveld 408576698