summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 16:54:53 +0000
committerrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 16:54:53 +0000
commitfda48c0a2ba6048b5877d8aed72b9de6caf7e3d4 (patch)
tree208fca68e4729d882f0b0bad0e072fc79c1babbf
parent771bf0f8eac62c5b889a210a438ac95e979d987a (diff)
downloadchromium_src-fda48c0a2ba6048b5877d8aed72b9de6caf7e3d4.zip
chromium_src-fda48c0a2ba6048b5877d8aed72b9de6caf7e3d4.tar.gz
chromium_src-fda48c0a2ba6048b5877d8aed72b9de6caf7e3d4.tar.bz2
Merge 275329 "Fix crash from missing app.binding in extensions."
> Fix crash from missing app.binding in extensions. > > This fixes an issue where a lazy require of app bindings (when unavailable) will not yield a properly constructed bindings export. > > BUG=373179 > > Review URL: https://codereview.chromium.org/319783002 TBR=rockot@chromium.org Review URL: https://codereview.chromium.org/325963008 git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@276057 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/resources/extensions/app_custom_bindings.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/resources/extensions/app_custom_bindings.js b/chrome/renderer/resources/extensions/app_custom_bindings.js
index e757502..0ef8360 100644
--- a/chrome/renderer/resources/extensions/app_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/app_custom_bindings.js
@@ -6,7 +6,7 @@
var GetAvailability = requireNative('v8_context').GetAvailability;
if (!GetAvailability('app').is_available) {
- exports.chromeApp = {};
+ exports.binding = {};
exports.onInstallStateResponse = function(){};
return;
}